Deprecate flag macros for toplevel, state, no window and composite child

[~andy/gtk] / gtk / gtkplug.c

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 4c31ea70d600573b482a0674ebd5805ed5cff25a..40623f0b2cb9f2c47b2f5680095f67b399304cb7 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -604,7 +604,7 @@ gtk_plug_realize (GtkWidget *widget)
   attributes_mask |= (window->title ? GDK_WA_TITLE : 0);
   attributes_mask |= (window->wmclass_name ? GDK_WA_WMCLASS : 0);
 
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     {
       attributes.window_type = GDK_WINDOW_TOPLEVEL;
 
@@ -651,7 +651,7 @@ gtk_plug_realize (GtkWidget *widget)
 static void
 gtk_plug_show (GtkWidget *widget)
 {
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     GTK_WIDGET_CLASS (gtk_plug_parent_class)->show (widget);
   else
     GTK_WIDGET_CLASS (bin_class)->show (widget);
@@ -660,7 +660,7 @@ gtk_plug_show (GtkWidget *widget)
 static void
 gtk_plug_hide (GtkWidget *widget)
 {
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     GTK_WIDGET_CLASS (gtk_plug_parent_class)->hide (widget);
   else
     GTK_WIDGET_CLASS (bin_class)->hide (widget);
@@ -674,7 +674,7 @@ void gdk_synthesize_window_state (GdkWindow     *window,
 static void
 gtk_plug_map (GtkWidget *widget)
 {
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     {
       GtkBin *bin = GTK_BIN (widget);
       GtkPlug *plug = GTK_PLUG (widget);
@@ -699,7 +699,7 @@ gtk_plug_map (GtkWidget *widget)
 static void
 gtk_plug_unmap (GtkWidget *widget)
 {
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     {
       GtkPlug *plug = GTK_PLUG (widget);
 
@@ -721,7 +721,7 @@ static void
 gtk_plug_size_allocate (GtkWidget     *widget,
                        GtkAllocation *allocation)
 {
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     GTK_WIDGET_CLASS (gtk_plug_parent_class)->size_allocate (widget, allocation);
   else
     {
@@ -754,7 +754,7 @@ static gboolean
 gtk_plug_key_press_event (GtkWidget   *widget,
                          GdkEventKey *event)
 {
-  if (GTK_WIDGET_TOPLEVEL (widget))
+  if (gtk_widget_is_toplevel (widget))
     return GTK_WIDGET_CLASS (gtk_plug_parent_class)->key_press_event (widget, event);
   else
     return FALSE;
@@ -959,7 +959,7 @@ gtk_plug_focus (GtkWidget        *widget,
 static void
 gtk_plug_check_resize (GtkContainer *container)
 {
-  if (GTK_WIDGET_TOPLEVEL (container))
+  if (gtk_widget_is_toplevel (GTK_WIDGET (container)))
     GTK_CONTAINER_CLASS (gtk_plug_parent_class)->check_resize (container);
   else
     GTK_CONTAINER_CLASS (bin_class)->check_resize (container);