From 25328e39d2a6e3ded82bf282a2e248ce7209f1b4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 11 Sep 2018 21:30:09 +0200 Subject: patch 8.1.0368: GTK code has too many #ifdefs and GTK 2.10 building fails Problem: GTK code has too many #ifdefs and building fails with GTK 2.10. Solution: Always use gtk_widget_get_window() and define it for older GTK versions. (Ken Takata, closes #3421) --- src/gui_gtk.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/gui_gtk.c') diff --git a/src/gui_gtk.c b/src/gui_gtk.c index ed539e386c..5c47f5ae93 100644 --- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -1932,11 +1932,7 @@ popup_menu_position_func(GtkMenu *menu UNUSED, gboolean *push_in UNUSED, gpointer user_data UNUSED) { -# if GTK_CHECK_VERSION(3,0,0) gdk_window_get_origin(gtk_widget_get_window(gui.drawarea), x, y); -# else - gdk_window_get_origin(gui.drawarea->window, x, y); -# endif if (popup_mouse_pos) { @@ -1946,12 +1942,8 @@ popup_menu_position_func(GtkMenu *menu UNUSED, *x += mx; *y += my; } -# if GTK_CHECK_VERSION(3,0,0) else if (curwin != NULL && gui.drawarea != NULL && gtk_widget_get_window(gui.drawarea) != NULL) -# else - else if (curwin != NULL && gui.drawarea != NULL && gui.drawarea->window != NULL) -# endif { /* Find the cursor position in the current window */ *x += FILL_X(curwin->w_wincol + curwin->w_wcol + 1) + 1; -- cgit v1.2.3