aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1086: can't build with GTK 3

Browse Source 
Problem:    Can't build with GTK 3.
Solution:   Rename function argument. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2017-09-09 23:00:56 +02:00
parent e09ba7bae5
commit 8696bbaf52
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui_gtk_x11.c
View File

@ -4942,11 +4942,11 @@ gui_mch_set_shellsize(int width, int height,
} }
void void
gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height) gui_gtk_get_screen_size_of_win(GtkWidget *wid, int *width, int *height)
{ {
#if GTK_CHECK_VERSION(3,22,0) #if GTK_CHECK_VERSION(3,22,0)
GdkDisplay *dpy = gtk_widget_get_display(win); GdkDisplay *dpy = gtk_widget_get_display(wid);
GdkWindow *win = gtk_widget_get_window(win); GdkWindow *win = gtk_widget_get_window(wid);
GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win); GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
GdkRectangle geometry; GdkRectangle geometry;
@ -4956,8 +4956,8 @@ gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height)
#else #else
GdkScreen* screen; GdkScreen* screen;
if (win != NULL && gtk_widget_has_screen(win)) if (wid != NULL && gtk_widget_has_screen(wid))
screen = gtk_widget_get_screen(win); screen = gtk_widget_get_screen(wid);
else else
screen = gdk_screen_get_default(); screen = gdk_screen_get_default();
*width = gdk_screen_get_width(screen); *width = gdk_screen_get_width(screen);

2
src/version.c
View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1086,
/**/ /**/
1085, 1085,
/**/ /**/