diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-11-21 20:55:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-11-21 20:55:58 +0100 |
| commit | 182707ac10d77359bf7a87c6b23ce4025d5b0ad4 (patch) | |
| tree | 11aebcaef98390d1bad30a7781e3346e821c59e0 /src/gui_gtk_x11.c | |
| parent | 63e4344edc0cc1b4ed68a9d9c787265799602670 (diff) | |
| download | vim-182707ac10d77359bf7a87c6b23ce4025d5b0ad4.zip | |
patch 8.0.0095
Problem: Problems with GTK 3.22.2 fixed in 3.22.4.
Solution: Adjust the #ifdefs. (Kazunobu Kuriyama)
Diffstat (limited to 'src/gui_gtk_x11.c')
| -rw-r--r-- | src/gui_gtk_x11.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 5020177d9..514ac9e31 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3102,7 +3102,7 @@ drawarea_configure_event_cb(GtkWidget *widget, g_return_val_if_fail(event && event->width >= 1 && event->height >= 1, TRUE); -# if GTK_CHECK_VERSION(3,22,2) +# if GTK_CHECK_VERSION(3,22,2) && !GTK_CHECK_VERSION(3,22,4) /* As of 3.22.2, GdkWindows have started distributing configure events to * their "native" children (https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-22&id=12579fe71b3b8f79eb9c1b80e429443bcc437dd0). * @@ -3123,6 +3123,10 @@ drawarea_configure_event_cb(GtkWidget *widget, * implementation details. Therefore, watch out any relevant internal * changes happening in GTK in the feature (sigh). */ + /* Follow-up + * After a few weeks later, the GdkWindow change mentioned above was + * reverted (https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-22&id=f70039cb9603a02d2369fec4038abf40a1711155). + * The corresponding official release is 3.22.4. */ if (event->send_event == FALSE) return TRUE; # endif @@ -4492,7 +4496,7 @@ form_configure_event(GtkWidget *widget UNUSED, { int usable_height = event->height; -#if GTK_CHECK_VERSION(3,22,2) +#if GTK_CHECK_VERSION(3,22,2) && !GTK_CHECK_VERSION(3,22,4) /* As of 3.22.2, GdkWindows have started distributing configure events to * their "native" children (https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-22&id=12579fe71b3b8f79eb9c1b80e429443bcc437dd0). * @@ -4508,6 +4512,10 @@ form_configure_event(GtkWidget *widget UNUSED, * To filter out such fallacious events, check if the given event is the * one that was sent out to the right place. Ignore it if not. */ + /* Follow-up + * After a few weeks later, the GdkWindow change mentioned above was + * reverted (https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-22&id=f70039cb9603a02d2369fec4038abf40a1711155). + * The corresponding official release is 3.22.4. */ if (event->window != gtk_widget_get_window(gui.formwin)) return TRUE; #endif |