Practically everything changed.

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

diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index fd9ff5cad7f382b2608c209171afb73436769c89..df13dfe153849b30184c6e92a72da6c75a91d12a 100644 (file)
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -24,9 +24,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
 #include "gtkcontainer.h"
 #include "gtkmisc.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -37,8 +40,6 @@ enum {
   PROP_YPAD
 };
 
-static void gtk_misc_class_init   (GtkMiscClass *klass);
-static void gtk_misc_init         (GtkMisc      *misc);
 static void gtk_misc_realize      (GtkWidget    *widget);
 static void gtk_misc_set_property (GObject         *object,
                                   guint            prop_id,
@@ -50,33 +51,7 @@ static void gtk_misc_get_property (GObject         *object,
                                   GParamSpec      *pspec);
 
 
-GType
-gtk_misc_get_type (void)
-{
-  static GType misc_type = 0;
-
-  if (!misc_type)
-    {
-      static const GTypeInfo misc_info =
-      {
-       sizeof (GtkMiscClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_misc_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkMisc),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_misc_init,
-       NULL,           /* value_table */
-      };
-
-      misc_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkMisc",
-                                         &misc_info, G_TYPE_FLAG_ABSTRACT);
-    }
-
-  return misc_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET)
 
 static void
 gtk_misc_class_init (GtkMiscClass *class)
@@ -96,11 +71,11 @@ gtk_misc_class_init (GtkMiscClass *class)
                                    PROP_XALIGN,
                                    g_param_spec_float ("xalign",
                                                       P_("X align"),
-                                                      P_("The horizontal alignment, from 0 (left) to 1 (right)"),
+                                                      P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."),
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YALIGN,
@@ -110,7 +85,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_XPAD,
@@ -120,7 +95,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YPAD,
@@ -130,7 +105,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 }
 
 static void
@@ -221,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;
       
@@ -234,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));
     }
 }
@@ -250,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,
@@ -282,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;
@@ -295,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));
     }
 }
@@ -311,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,
@@ -329,14 +307,10 @@ gtk_misc_get_padding (GtkMisc *misc,
 static void
 gtk_misc_realize (GtkWidget *widget)
 {
-  GtkMisc *misc;
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_MISC (widget));
-
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  misc = GTK_MISC (widget);
 
   if (GTK_WIDGET_NO_WINDOW (widget))
     {
@@ -364,3 +338,6 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
+
+#define __GTK_MISC_C__
+#include "gtkaliasdef.c"