Permalink
Browse files

patch 8.0.1086: can't build with GTK 3

Problem:    Can't build with GTK 3.
Solution:   Rename function argument. (Kazunobu Kuriyama)
  • Loading branch information...
brammool committed Sep 9, 2017
1 parent e09ba7b commit 8696bbaf52cca7c1fcbd5000c83406e462b7dbf4
Showing with 7 additions and 5 deletions.
  1. +5 −5 src/gui_gtk_x11.c
  2. +2 −0 src/version.c
View
@@ -4942,11 +4942,11 @@ gui_mch_set_shellsize(int width, int height,
}
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)
GdkDisplay *dpy = gtk_widget_get_display(win);
GdkWindow *win = gtk_widget_get_window(win);
GdkDisplay *dpy = gtk_widget_get_display(wid);
GdkWindow *win = gtk_widget_get_window(wid);
GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
GdkRectangle geometry;
@@ -4956,8 +4956,8 @@ gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height)
#else
GdkScreen* screen;
if (win != NULL && gtk_widget_has_screen(win))
screen = gtk_widget_get_screen(win);
if (wid != NULL && gtk_widget_has_screen(wid))
screen = gtk_widget_get_screen(wid);
else
screen = gdk_screen_get_default();
*width = gdk_screen_get_width(screen);
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1086,
/**/
1085,
/**/

0 comments on commit 8696bba

Please sign in to comment.