]> 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 94cd489254f94d26cbd006eea221691c819c631c..3532ab90cedd4b6fcc5020f226a45cde6b69e429 100644 (file)
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * 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"
 
 
-static void gtk_misc_class_init (GtkMiscClass *klass);
-static void gtk_misc_init       (GtkMisc      *misc);
-static void gtk_misc_realize    (GtkWidget    *widget);
-
+enum {
+  PROP_0,
+  PROP_XALIGN,
+  PROP_YALIGN,
+  PROP_XPAD,
+  PROP_YPAD
+};
 
-guint
-gtk_misc_get_type ()
-{
-  static guint 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)
-    {
-      GtkTypeInfo misc_info =
-      {
-       "GtkMisc",
-       sizeof (GtkMisc),
-       sizeof (GtkMiscClass),
-       (GtkClassInitFunc) gtk_misc_class_init,
-       (GtkObjectInitFunc) gtk_misc_init,
-       (GtkArgSetFunc) NULL,
-        (GtkArgGetFunc) NULL,
-      };
-
-      misc_type = gtk_type_unique (gtk_widget_get_type (), &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;
   GtkWidgetClass *widget_class;
 
+  gobject_class = G_OBJECT_CLASS (class);
   widget_class = (GtkWidgetClass*) class;
 
+  gobject_class->set_property = gtk_misc_set_property;
+  gobject_class->get_property = gtk_misc_get_property;
+  
   widget_class->realize = gtk_misc_realize;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_XALIGN,
+                                   g_param_spec_float ("xalign",
+                                                      P_("X align"),
+                                                      P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."),
+                                                      0.0,
+                                                      1.0,
+                                                      0.5,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_YALIGN,
+                                   g_param_spec_float ("yalign",
+                                                      P_("Y align"),
+                                                      P_("The vertical alignment, from 0 (top) to 1 (bottom)"),
+                                                      0.0,
+                                                      1.0,
+                                                      0.5,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_XPAD,
+                                   g_param_spec_int ("xpad",
+                                                    P_("X pad"),
+                                                    P_("The amount of space to add on the left and right of the widget, in pixels"),
+                                                    0,
+                                                    G_MAXINT,
+                                                    0,
+                                                    GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_YPAD,
+                                   g_param_spec_int ("ypad",
+                                                    P_("Y pad"),
+                                                    P_("The amount of space to add on the top and bottom of the widget, in pixels"),
+                                                    0,
+                                                    G_MAXINT,
+                                                    0,
+                                                    GTK_PARAM_READWRITE));
 }
 
 static void
 gtk_misc_init (GtkMisc *misc)
 {
-  GTK_WIDGET_SET_FLAGS (misc, GTK_BASIC);
-
   misc->xalign = 0.5;
   misc->yalign = 0.5;
   misc->xpad = 0;
   misc->ypad = 0;
 }
 
+static void
+gtk_misc_set_property (GObject      *object,
+                      guint         prop_id,
+                      const GValue *value,
+                      GParamSpec   *pspec)
+{
+  GtkMisc *misc;
+
+  misc = GTK_MISC (object);
+
+  switch (prop_id)
+    {
+    case PROP_XALIGN:
+      gtk_misc_set_alignment (misc, g_value_get_float (value), misc->yalign);
+      break;
+    case PROP_YALIGN:
+      gtk_misc_set_alignment (misc, misc->xalign, g_value_get_float (value));
+      break;
+    case PROP_XPAD:
+      gtk_misc_set_padding (misc, g_value_get_int (value), misc->ypad);
+      break;
+    case PROP_YPAD:
+      gtk_misc_set_padding (misc, misc->xpad, g_value_get_int (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_misc_get_property (GObject      *object,
+                      guint         prop_id,
+                      GValue       *value,
+                      GParamSpec   *pspec)
+{
+  GtkMisc *misc;
+
+  misc = GTK_MISC (object);
+
+  switch (prop_id)
+    {
+    case PROP_XALIGN:
+      g_value_set_float (value, misc->xalign);
+      break;
+    case PROP_YALIGN:
+      g_value_set_float (value, misc->yalign);
+      break;
+    case PROP_XPAD:
+      g_value_set_int (value, misc->xpad);
+      break;
+    case PROP_YPAD:
+      g_value_set_int (value, misc->ypad);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
 void
 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)
@@ -89,75 +196,126 @@ 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;
-
+      
       /* clear the area that was allocated before the change
-      */
-      if (GTK_WIDGET_VISIBLE (misc))
+       */
+      if (GTK_WIDGET_DRAWABLE (misc))
         {
           GtkWidget *widget;
-
+         
           widget = GTK_WIDGET (misc);
-          gdk_window_clear_area (widget->window,
-                                 widget->allocation.x,
-                                 widget->allocation.y,
-                                 widget->allocation.width,
-                                 widget->allocation.height);
+          gtk_widget_queue_draw (widget);
         }
 
-      gtk_widget_queue_draw (GTK_WIDGET (misc));
+      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,
                      gint     ypad)
 {
   GtkRequisition *requisition;
-
-  g_return_if_fail (misc != NULL);
+  
   g_return_if_fail (GTK_IS_MISC (misc));
-
+  
   if (xpad < 0)
     xpad = 0;
   if (ypad < 0)
     ypad = 0;
-
+  
   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;
-
+      
       misc->xpad = xpad;
       misc->ypad = ypad;
-
+      
       requisition->width += misc->xpad * 2;
       requisition->height += misc->ypad * 2;
-
-      if (GTK_WIDGET (misc)->parent && GTK_WIDGET_VISIBLE (misc))
+      
+      if (GTK_WIDGET_DRAWABLE (misc))
        gtk_widget_queue_resize (GTK_WIDGET (misc));
+
+      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);
+      g_object_ref (widget->window);
       widget->style = gtk_style_attach (widget->style, widget->window);
     }
   else
@@ -180,3 +338,6 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
+
+#define __GTK_MISC_C__
+#include "gtkaliasdef.c"