diff options
| -rw-r--r-- | gtk/gui_utils.c | 4 | ||||
| -rw-r--r-- | gtk/old-gtk-compat.h | 1 | ||||
| -rwxr-xr-x | tools/checkAPIs.pl | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index b9be43be90..7a9cdcf276 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -528,11 +528,7 @@ window_destroy(GtkWidget *win) * cannot be retrieved at destroy time (so don't use event "destroy" for this) */ /* ...and don't do this at all, if we currently have no GdkWindow (e.g. if the * GtkWidget is hidden) */ -#if GTK_CHECK_VERSION(2,18,0) if(gtk_widget_get_has_window (win) && gtk_widget_get_visible(win)) { -#else - if(!GTK_WIDGET_NO_WINDOW(win) && gtk_widget_get_visible(win)) { -#endif window_get_geometry(win, &geom); name = g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY); diff --git a/gtk/old-gtk-compat.h b/gtk/old-gtk-compat.h index 1f0955cef4..844509f287 100644 --- a/gtk/old-gtk-compat.h +++ b/gtk/old-gtk-compat.h @@ -47,6 +47,7 @@ #endif #if !GTK_CHECK_VERSION (2, 18, 0) +# define gtk_widget_get_has_window(x) (!GTK_WIDGET_NO_WINDOW(x)) # define gtk_widget_get_visible(x) GTK_WIDGET_VISIBLE(x) #endif diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index 060c5efd24..bf137db618 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -924,7 +924,7 @@ my %deprecatedGtkFunctions = ( 'GTK_WIDGET_HAS_GRAB', 'E', # gtk_widget_get_has_grab() (avail since 2.18) 'GTK_WIDGET_IS_SENSITIVE', 'E', # gtk_widget_get_is_sensitive() (avail since 2.18) 'GTK_WIDGET_MAPPED', 'E', # gtk_widget_get_mapped() (avail since 2.18) - 'GTK_WIDGET_NO_WINDOW', 'W', # gtk_widget_get_no_window() (avail since 2.18) + 'GTK_WIDGET_NO_WINDOW', 'E', # gtk_widget_get_no_window() (avail since 2.18) 'GTK_WIDGET_PARENT_SENSITIVE', 'E', # gtk_widget_get_parent_sensitive() (avail since 2.18) 'GTK_WIDGET_RC_STYLE', 'E', # gtk_widget_get_rc_style() (avail since 2.18) 'GTK_WIDGET_REALIZED', 'E', # gtk_widget_get_realized() (avail since 2.18) |