aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.0.0095

Browse Source 
Problem:    Problems with GTK 3.22.2 fixed in 3.22.4.
Solution:   Adjust the #ifdefs. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2016-11-21 20:55:58 +01:00
parent 63e4344edc
commit 182707ac10
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui_gtk_x11.c
View File

@@ -3102,7 +3102,7 @@ drawarea_configure_event_cb(GtkWidget *widget,
g_return_val_if_fail(event g_return_val_if_fail(event
&& event->width >= 1 && event->height >= 1, TRUE); && 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 /* 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). * 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 * implementation details. Therefore, watch out any relevant internal
* changes happening in GTK in the feature (sigh). * 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) if (event->send_event == FALSE)
return TRUE; return TRUE;
# endif # endif
@@ -4492,7 +4496,7 @@ form_configure_event(GtkWidget *widget UNUSED,
{ {
int usable_height = event->height; 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 /* 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). * 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 * 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. * 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)) if (event->window != gtk_widget_get_window(gui.formwin))
return TRUE; return TRUE;
#endif #endif

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
95,
/**/ /**/
94, 94,
/**/ /**/