Deprecate widget flag: GTK_WIDGET_VISIBLE

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

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index f14224e271e3d09b6dc1f5d3d9e4e9290af4927b..1e1f9dc9249998b9c942356c453dabf1997e7809 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -96,13 +96,9 @@ static void gtk_box_get_child_property (GtkContainer   *container,
 static GType gtk_box_child_type        (GtkContainer   *container);
 
 
-#if 0
-G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
-                                                NULL));
-#else
-G_DEFINE_ABSTRACT_TYPE (GtkBox, gtk_box, GTK_TYPE_CONTAINER);
-#endif
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
+                                  G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
+                                                         NULL));
 
 static void
 gtk_box_class_init (GtkBoxClass *class)
@@ -277,7 +273,7 @@ gtk_box_size_request (GtkWidget      *widget,
       child = children->data;
       children = children->next;
 
-      if (GTK_WIDGET_VISIBLE (child->widget))
+      if (gtk_widget_get_visible (child->widget))
        {
          GtkRequisition child_requisition;
 
@@ -358,7 +354,7 @@ gtk_box_size_allocate (GtkWidget     *widget,
     {
       child = children->data;
 
-      if (GTK_WIDGET_VISIBLE (child->widget))
+      if (gtk_widget_get_visible (child->widget))
        {
          nvis_children += 1;
          if (child->expand)
@@ -418,7 +414,7 @@ gtk_box_size_allocate (GtkWidget     *widget,
          child = children->data;
          children = children->next;
 
-         if ((child->pack == GTK_PACK_START) && GTK_WIDGET_VISIBLE (child->widget))
+         if ((child->pack == GTK_PACK_START) && gtk_widget_get_visible (child->widget))
            {
              if (box->homogeneous)
                {
@@ -517,7 +513,7 @@ gtk_box_size_allocate (GtkWidget     *widget,
          child = children->data;
          children = children->next;
 
-         if ((child->pack == GTK_PACK_END) && GTK_WIDGET_VISIBLE (child->widget))
+         if ((child->pack == GTK_PACK_END) && gtk_widget_get_visible (child->widget))
            {
              GtkRequisition child_requisition;
 
@@ -1064,7 +1060,8 @@ gtk_box_reorder_child (GtkBox    *box,
   box->children = g_list_insert_before (box->children, new_link, child_info);
 
   gtk_widget_child_notify (child, "position");
-  if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
+  if (gtk_widget_get_visible (child)
+      && gtk_widget_get_visible (GTK_WIDGET (box)))
     gtk_widget_queue_resize (child);
 }
 
@@ -1166,7 +1163,8 @@ gtk_box_set_child_packing (GtkBox      *box,
        child_info->pack = GTK_PACK_START;
       gtk_widget_child_notify (child, "pack-type");
 
-      if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
+      if (gtk_widget_get_visible (child)
+          && gtk_widget_get_visible (GTK_WIDGET (box)))
        gtk_widget_queue_resize (child);
     }
   gtk_widget_thaw_child_notify (child);
@@ -1213,14 +1211,14 @@ gtk_box_remove (GtkContainer *container,
        {
          gboolean was_visible;
 
-         was_visible = GTK_WIDGET_VISIBLE (widget);
+         was_visible = gtk_widget_get_visible (widget);
          gtk_widget_unparent (widget);
 
          box->children = g_list_remove_link (box->children, children);
          g_list_free (children);
          g_free (child);
 
-         /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+         /* queue resize regardless of gtk_widget_get_visible (container),
           * since that's what is needed by toplevels.
           */
          if (was_visible)