diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-11 21:30:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-11 21:30:09 +0200 |
| commit | 25328e39d2a6e3ded82bf282a2e248ce7209f1b4 (patch) | |
| tree | a60cc0fc5c4379c8d5bd0c35c89e3bc200611898 /src/gui_gtk.c | |
| parent | 84d9390480548c8d711dd772cb162a91d0bb3c30 (diff) | |
| download | vim-git-25328e39d2a6e3ded82bf282a2e248ce7209f1b4.tar.gz | |
patch 8.1.0368: GTK code has too many #ifdefs and GTK 2.10 building failsv8.1.0368
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)
Diffstat (limited to 'src/gui_gtk.c')
| -rw-r--r-- | src/gui_gtk.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c index ed539e386..5c47f5ae9 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; |