aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0368: GTK code has too many #ifdefs and GTK 2.10 building fails

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2018-09-11 21:30:09 +02:00
parent 84d9390480
commit 25328e39d2
7 changed files with 13 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui_gtk.c
View File

@@ -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;