summaryrefslogtreecommitdiff
path: root/gtk/gtkviewport.c
diff options
context:
space:
mode:
authorChristian Dywan <christian@twotoasts.de>2010-01-04 07:49:26 +0100
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2010-04-03 20:55:07 -0400
commitfc2cbf960cb93f309001a7fec9fbd699de6c9791 (patch)
tree9acf8572b3d8eaa2136aeb23cf92e84f60ef44ae /gtk/gtkviewport.c
parent20dcd8a723bcfc5e8cf4f2c6ed0e793580ed0f65 (diff)
downloadgtk+-fc2cbf960cb93f309001a7fec9fbd699de6c9791.tar.gz
Deprecate flag macros for toplevel, state, no window and composite child
Deprecate widget flag macros GTK_WIDGET_STATE, GTK_WIDGET_SAVED_STATE, GTK_WIDGET_FLAGS, GTK_WIDGET_TOPLEVEL, GTK_WIDGET_NO_WINDOW and GTK_WIDGET_COMPOSITE_CHILD. Also deprecate the type macros GTK_WIDGET_TYPE, GTK_OBJECT_TYPE_NAME and GTK_OBJECT_TYPE which have become redundant. Instances of GTK_WIDGET_TOPLEVEL are replaced with gtk_widget_is_toplevel, GTK_WIDGET_TYPE is replaced with G_OBJECT_TYPE, GTK_WIDGET_COMPOSITE_CHILD is replaced with use of the "composite-child" property and uses of GTK_WIDGET_NO_WINDOW are adjusted to use gtk_widget_get_has_window. Uses of GTK_WIDGET_SAVED_STATE and GTK_WIDGET_FLAGS inside GtkWidget are changed to direct flag usage. Documentation is updated to refer to gtk_widget_set_has_window and gtk_widget_get_has_window. Gail and tests are updated as well. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=69872
Diffstat (limited to 'gtk/gtkviewport.c')
-rw-r--r--gtk/gtkviewport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 4fd37b5666..d650a4029e 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -840,7 +840,7 @@ gtk_viewport_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
if (GTK_WIDGET_REALIZED (widget) &&
- !GTK_WIDGET_NO_WINDOW (widget))
+ gtk_widget_get_has_window (widget))
{
GtkViewport *viewport = GTK_VIEWPORT (widget);