]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkmisc.c
Deprecate flag macros for toplevel, state, no window and composite child
[~andy/gtk] / gtk / gtkmisc.c
index cd8782486f477a06cda3845b1c926ee1ee4de4fa..3532ab90cedd4b6fcc5020f226a45cde6b69e429 100644 (file)
  * 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,53 +40,26 @@ 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,
-                                 const GValue    *value,
-                                 GParamSpec      *pspec);
-static void gtk_misc_get_property(GObject         *object,
-                                 guint            prop_id,
-                                 GValue          *value,
-                                 GParamSpec      *pspec);
-
-
-GtkType
-gtk_misc_get_type (void)
-{
-  static GtkType misc_type = 0;
+static void gtk_misc_realize      (GtkWidget    *widget);
+static void gtk_misc_set_property (GObject         *object,
+                                  guint            prop_id,
+                                  const GValue    *value,
+                                  GParamSpec      *pspec);
+static void gtk_misc_get_property (GObject         *object,
+                                  guint            prop_id,
+                                  GValue          *value,
+                                  GParamSpec      *pspec);
 
-  if (!misc_type)
-    {
-      static const GtkTypeInfo misc_info =
-      {
-       "GtkMisc",
-       sizeof (GtkMisc),
-       sizeof (GtkMiscClass),
-       (GtkClassInitFunc) gtk_misc_class_init,
-       (GtkObjectInitFunc) gtk_misc_init,
-        /* reserved_1 */ NULL,
-       /* reserved_2 */ NULL,
-       (GtkClassInitFunc) NULL,
-      };
-
-      misc_type = gtk_type_unique (GTK_TYPE_WIDGET, &misc_info);
-    }
 
-  return misc_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET)
 
 static void
 gtk_misc_class_init (GtkMiscClass *class)
 {
   GObjectClass   *gobject_class;
-  GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
 
   gobject_class = G_OBJECT_CLASS (class);
-  object_class = (GtkObjectClass*) class;
   widget_class = (GtkWidgetClass*) class;
 
   gobject_class->set_property = gtk_misc_set_property;
@@ -94,42 +70,42 @@ gtk_misc_class_init (GtkMiscClass *class)
   g_object_class_install_property (gobject_class,
                                    PROP_XALIGN,
                                    g_param_spec_float ("xalign",
-                                                      _("X align"),
-                                                      _("The horizontal alignment, from 0 (left) to 1 (right)"),
+                                                      P_("X align"),
+                                                      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,
                                    g_param_spec_float ("yalign",
-                                                      _("Y align"),
-                                                      _("The vertical alignment, from 0 (top) to 1 (bottom)"),
+                                                      P_("Y align"),
+                                                      P_("The vertical alignment, from 0 (top) to 1 (bottom)"),
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_XPAD,
                                    g_param_spec_int ("xpad",
-                                                    _("X pad"),
-                                                    _("The amount of space to add on the left and right of the widget, in pixels"),
+                                                    P_("X pad"),
+                                                    P_("The amount of space to add on the left and right of the widget, in pixels"),
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YPAD,
                                    g_param_spec_int ("ypad",
-                                                    _("Y pad"),
-                                                    _("The amount of space to add on the top and bottom of the widget, in pixels"),
+                                                    P_("Y pad"),
+                                                    P_("The amount of space to add on the top and bottom of the widget, in pixels"),
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 }
 
 static void
@@ -206,7 +182,6 @@ gtk_misc_set_alignment (GtkMisc *misc,
                        gfloat   xalign,
                        gfloat   yalign)
 {
-  g_return_if_fail (misc != NULL);
   g_return_if_fail (GTK_IS_MISC (misc));
 
   if (xalign < 0.0)
@@ -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;
       
@@ -231,17 +213,35 @@ gtk_misc_set_alignment (GtkMisc *misc,
           GtkWidget *widget;
          
           widget = GTK_WIDGET (misc);
-          gtk_widget_queue_clear (widget);
+          gtk_widget_queue_draw (widget);
         }
 
-      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));
     }
 }
 
+/**
+ * gtk_misc_get_alignment:
+ * @misc: a #GtkMisc
+ * @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().
+ **/
+void
+gtk_misc_get_alignment (GtkMisc *misc,
+                       gfloat  *xalign,
+                       gfloat  *yalign)
+{
+  g_return_if_fail (GTK_IS_MISC (misc));
+
+  if (xalign)
+    *xalign = misc->xalign;
+  if (yalign)
+    *yalign = misc->yalign;
+}
+
 void
 gtk_misc_set_padding (GtkMisc *misc,
                      gint     xpad,
@@ -249,7 +249,6 @@ gtk_misc_set_padding (GtkMisc *misc,
 {
   GtkRequisition *requisition;
   
-  g_return_if_fail (misc != NULL);
   g_return_if_fail (GTK_IS_MISC (misc));
   
   if (xpad < 0)
@@ -259,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;
@@ -272,31 +278,44 @@ gtk_misc_set_padding (GtkMisc *misc,
       if (GTK_WIDGET_DRAWABLE (misc))
        gtk_widget_queue_resize (GTK_WIDGET (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));
     }
 }
 
+/**
+ * gtk_misc_get_padding:
+ * @misc: a #GtkMisc
+ * @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().
+ **/
+void
+gtk_misc_get_padding (GtkMisc *misc,
+                     gint    *xpad,
+                     gint    *ypad)
+{
+  g_return_if_fail (GTK_IS_MISC (misc));
+
+  if (xpad)
+    *xpad = misc->xpad;
+  if (ypad)
+    *ypad = misc->ypad;
+}
+
 static void
 gtk_misc_realize (GtkWidget *widget)
 {
-  GtkMisc *misc;
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (widget != NULL);
-  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))
+  if (!gtk_widget_get_has_window (widget))
     {
       widget->window = gtk_widget_get_parent_window (widget);
-      gdk_window_ref (widget->window);
+      g_object_ref (widget->window);
       widget->style = gtk_style_attach (widget->style, widget->window);
     }
   else
@@ -319,3 +338,6 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
+
+#define __GTK_MISC_C__
+#include "gtkaliasdef.c"