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

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

diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index a876d0b0239399719d5ca369cae61ca3d5503a16..3532ab90cedd4b6fcc5020f226a45cde6b69e429 100644 (file)
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 #include "gtkcontainer.h"
 #include "gtkmisc.h"
 #include "gtkintl.h"
@@ -51,7 +51,7 @@ static void gtk_misc_get_property (GObject         *object,
                                   GParamSpec      *pspec);
 
 
-G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET);
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET)
 
 static void
 gtk_misc_class_init (GtkMiscClass *class)
@@ -196,6 +196,13 @@ gtk_misc_set_alignment (GtkMisc *misc,
 
   if ((xalign != misc->xalign) || (yalign != misc->yalign))
     {
+      g_object_freeze_notify (G_OBJECT (misc));
+      if (xalign != misc->xalign)
+       g_object_notify (G_OBJECT (misc), "xalign");
+
+      if (yalign != misc->yalign)
+       g_object_notify (G_OBJECT (misc), "yalign");
+
       misc->xalign = xalign;
       misc->yalign = yalign;
       
@@ -209,12 +216,6 @@ gtk_misc_set_alignment (GtkMisc *misc,
           gtk_widget_queue_draw (widget);
         }
 
-      g_object_freeze_notify (G_OBJECT (misc));
-      if (xalign != misc->xalign)
-       g_object_notify (G_OBJECT (misc), "xalign");
-
-      if (yalign != misc->yalign)
-       g_object_notify (G_OBJECT (misc), "yalign");
       g_object_thaw_notify (G_OBJECT (misc));
     }
 }
@@ -225,8 +226,8 @@ gtk_misc_set_alignment (GtkMisc *misc,
  * @xalign: location to store X alignment of @misc, or %NULL
  * @yalign: location to store Y alignment of @misc, or %NULL
  *
- * Gets the X and Y alignment of the widget within its allocation. See
- * gtk_misc_set_alignment().
+ * Gets the X and Y alignment of the widget within its allocation. 
+ * See gtk_misc_set_alignment().
  **/
 void
 gtk_misc_get_alignment (GtkMisc *misc,
@@ -257,6 +258,13 @@ gtk_misc_set_padding (GtkMisc *misc,
   
   if ((xpad != misc->xpad) || (ypad != misc->ypad))
     {
+      g_object_freeze_notify (G_OBJECT (misc));
+      if (xpad != misc->xpad)
+       g_object_notify (G_OBJECT (misc), "xpad");
+
+      if (ypad != misc->ypad)
+       g_object_notify (G_OBJECT (misc), "ypad");
+
       requisition = &(GTK_WIDGET (misc)->requisition);
       requisition->width -= misc->xpad * 2;
       requisition->height -= misc->ypad * 2;
@@ -270,12 +278,6 @@ gtk_misc_set_padding (GtkMisc *misc,
       if (GTK_WIDGET_DRAWABLE (misc))
        gtk_widget_queue_resize (GTK_WIDGET (misc));
 
-      g_object_freeze_notify (G_OBJECT (misc));
-      if (xpad != misc->xpad)
-       g_object_notify (G_OBJECT (misc), "xpad");
-
-      if (ypad != misc->ypad)
-       g_object_notify (G_OBJECT (misc), "ypad");
       g_object_thaw_notify (G_OBJECT (misc));
     }
 }
@@ -286,7 +288,8 @@ gtk_misc_set_padding (GtkMisc *misc,
  * @xpad: location to store padding in the X direction, or %NULL
  * @ypad: location to store padding in the Y direction, or %NULL
  *
- * Gets the padding in the X and Y directions of the widget. See gtk_misc_set_padding().
+ * Gets the padding in the X and Y directions of the widget. 
+ * See gtk_misc_set_padding().
  **/
 void
 gtk_misc_get_padding (GtkMisc *misc,
@@ -307,11 +310,9 @@ gtk_misc_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_MISC (widget));
-
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
-  if (GTK_WIDGET_NO_WINDOW (widget))
+  if (!gtk_widget_get_has_window (widget))
     {
       widget->window = gtk_widget_get_parent_window (widget);
       g_object_ref (widget->window);