]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtklayout.c
Revert name change
[~andy/gtk] / gtk / gtklayout.c
index b47ff7f674b050180a5dd352e4d685968a15e2b3..426376c5b02e4da2f23a5b05db6018c799afc17a 100644 (file)
@@ -28,7 +28,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 #include "gdkconfig.h"
 
 #include "gtklayout.h"
@@ -59,7 +59,6 @@ enum {
   CHILD_PROP_Y
 };
 
-static void gtk_layout_class_init         (GtkLayoutClass *class);
 static void gtk_layout_get_property       (GObject        *object,
                                            guint           prop_id,
                                            GValue         *value,
@@ -71,7 +70,6 @@ static void gtk_layout_set_property       (GObject        *object,
 static GObject *gtk_layout_constructor    (GType                  type,
                                           guint                  n_properties,
                                           GObjectConstructParam *properties);
-static void gtk_layout_init               (GtkLayout      *layout);
 static void gtk_layout_finalize           (GObject        *object);
 static void gtk_layout_realize            (GtkWidget      *widget);
 static void gtk_layout_unrealize          (GtkWidget      *widget);
@@ -114,7 +112,7 @@ static void gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
                                             gdouble        upper,
                                             gboolean       always_emit_changed);
 
-static GtkWidgetClass *parent_class = NULL;
+G_DEFINE_TYPE (GtkLayout, gtk_layout, GTK_TYPE_CONTAINER)
 
 /* Public interface
  */
@@ -144,6 +142,24 @@ gtk_layout_new (GtkAdjustment *hadjustment,
   return GTK_WIDGET (layout);
 }
 
+/**
+ * gtk_layout_get_bin_window:
+ * @layout: a #GtkLayout
+ * 
+ * Retrieve the bin window of the layout used for drawing operations.
+ * 
+ * Return value: a #GdkWindow
+ *
+ * Since: 2.14
+ **/
+GdkWindow*
+gtk_layout_get_bin_window (GtkLayout *layout)
+{
+  g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
+
+  return layout->bin_window;
+}
+
 /**
  * gtk_layout_get_hadjustment:
  * @layout: a #GtkLayout
@@ -228,8 +244,7 @@ gtk_layout_set_adjustments (GtkLayout     *layout,
   if (layout->hadjustment != hadj)
     {
       layout->hadjustment = hadj;
-      g_object_ref (layout->hadjustment);
-      gtk_object_sink (GTK_OBJECT (layout->hadjustment));
+      g_object_ref_sink (layout->hadjustment);
       gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
       
       g_signal_connect (layout->hadjustment, "value_changed",
@@ -241,8 +256,7 @@ gtk_layout_set_adjustments (GtkLayout     *layout,
   if (layout->vadjustment != vadj)
     {
       layout->vadjustment = vadj;
-      g_object_ref (layout->vadjustment);
-      gtk_object_sink (GTK_OBJECT (layout->vadjustment));
+      g_object_ref_sink (layout->vadjustment);
       gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
       
       g_signal_connect (layout->vadjustment, "value_changed",
@@ -265,7 +279,7 @@ gtk_layout_finalize (GObject *object)
   g_object_unref (layout->hadjustment);
   g_object_unref (layout->vadjustment);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_layout_parent_class)->finalize (object);
 }
 
 /**
@@ -374,11 +388,7 @@ gtk_layout_move_internal (GtkLayout       *layout,
                           gint             y)
 {
   GtkLayoutChild *child;
-  
-  g_return_if_fail (GTK_IS_LAYOUT (layout));
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (widget->parent == GTK_WIDGET (layout));  
-  
+
   child = get_child (layout, widget);
 
   g_assert (child);
@@ -561,33 +571,6 @@ gtk_layout_thaw (GtkLayout *layout)
 
 /* Basic Object handling procedures
  */
-GType
-gtk_layout_get_type (void)
-{
-  static GType layout_type = 0;
-
-  if (!layout_type)
-    {
-      static const GTypeInfo layout_info =
-      {
-       sizeof (GtkLayoutClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_layout_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkLayout),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_layout_init,
-      };
-
-      layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout",
-                                           &layout_info, 0);
-    }
-
-  return layout_type;
-}
-
 static void
 gtk_layout_class_init (GtkLayoutClass *class)
 {
@@ -599,8 +582,6 @@ gtk_layout_class_init (GtkLayoutClass *class)
   widget_class = (GtkWidgetClass*) class;
   container_class = (GtkContainerClass*) class;
 
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->set_property = gtk_layout_set_property;
   gobject_class->get_property = gtk_layout_get_property;
   gobject_class->finalize = gtk_layout_finalize;
@@ -617,7 +598,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                                 G_MININT,
                                                                 G_MAXINT,
                                                                 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
 
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_Y,
@@ -627,7 +608,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                                 G_MININT,
                                                                 G_MAXINT,
                                                                 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_HADJUSTMENT,
@@ -635,7 +616,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                        P_("Horizontal adjustment"),
                                                        P_("The GtkAdjustment for the horizontal position"),
                                                        GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_VADJUSTMENT,
@@ -643,7 +624,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                        P_("Vertical adjustment"),
                                                        P_("The GtkAdjustment for the vertical position"),
                                                        GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_WIDTH,
@@ -653,7 +634,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     100,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_HEIGHT,
                                   g_param_spec_uint ("height",
@@ -662,7 +643,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     100,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   widget_class->realize = gtk_layout_realize;
   widget_class->unrealize = gtk_layout_unrealize;
   widget_class->map = gtk_layout_map;
@@ -678,7 +659,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
   class->set_scroll_adjustments = gtk_layout_set_adjustments;
 
   widget_class->set_scroll_adjustments_signal =
-    g_signal_new ("set_scroll_adjustments",
+    g_signal_new (I_("set_scroll_adjustments"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkLayoutClass, set_scroll_adjustments),
@@ -830,9 +811,9 @@ gtk_layout_constructor (GType                  type,
   GObject *object;
   GtkAdjustment *hadj, *vadj;
   
-  object = G_OBJECT_CLASS (parent_class)->constructor (type,
-                                                      n_properties,
-                                                      properties);
+  object = G_OBJECT_CLASS (gtk_layout_parent_class)->constructor (type,
+                                                                 n_properties,
+                                                                 properties);
 
   layout = GTK_LAYOUT (object);
 
@@ -851,14 +832,11 @@ gtk_layout_constructor (GType                  type,
 static void 
 gtk_layout_realize (GtkWidget *widget)
 {
+  GtkLayout *layout = GTK_LAYOUT (widget);
   GList *tmp_list;
-  GtkLayout *layout;
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_LAYOUT (widget));
-
-  layout = GTK_LAYOUT (widget);
   GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
 
   attributes.window_type = GDK_WINDOW_CHILD;
@@ -875,6 +853,7 @@ gtk_layout_realize (GtkWidget *widget)
 
   widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                   &attributes, attributes_mask);
+  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
   gdk_window_set_user_data (widget->window, widget);
 
   attributes.x = - layout->hadjustment->value,
@@ -889,7 +868,6 @@ gtk_layout_realize (GtkWidget *widget)
   gdk_window_set_user_data (layout->bin_window, widget);
 
   widget->style = gtk_style_attach (widget->style, widget->window);
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
   gtk_style_set_background (widget->style, layout->bin_window, GTK_STATE_NORMAL);
 
   tmp_list = layout->children;
@@ -905,8 +883,8 @@ gtk_layout_realize (GtkWidget *widget)
 static void
 gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
 {
-  if (GTK_WIDGET_CLASS (parent_class)->style_set)
-    (* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, old_style);
+  if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set)
+    (* GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set) (widget, old_style);
 
   if (GTK_WIDGET_REALIZED (widget))
     {
@@ -914,15 +892,11 @@ gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
     }
 }
 
-static void 
+static void
 gtk_layout_map (GtkWidget *widget)
 {
+  GtkLayout *layout = GTK_LAYOUT (widget);
   GList *tmp_list;
-  GtkLayout *layout;
-
-  g_return_if_fail (GTK_IS_LAYOUT (widget));
-
-  layout = GTK_LAYOUT (widget);
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
@@ -946,30 +920,22 @@ gtk_layout_map (GtkWidget *widget)
 static void 
 gtk_layout_unrealize (GtkWidget *widget)
 {
-  GtkLayout *layout;
-
-  g_return_if_fail (GTK_IS_LAYOUT (widget));
-
-  layout = GTK_LAYOUT (widget);
+  GtkLayout *layout = GTK_LAYOUT (widget);
 
   gdk_window_set_user_data (layout->bin_window, NULL);
   gdk_window_destroy (layout->bin_window);
   layout->bin_window = NULL;
 
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize)
+    (* GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize) (widget);
 }
 
 static void     
 gtk_layout_size_request (GtkWidget     *widget,
                         GtkRequisition *requisition)
 {
+  GtkLayout *layout = GTK_LAYOUT (widget);
   GList *tmp_list;
-  GtkLayout *layout;
-
-  g_return_if_fail (GTK_IS_LAYOUT (widget));
-
-  layout = GTK_LAYOUT (widget);
 
   requisition->width = 0;
   requisition->height = 0;
@@ -991,14 +957,10 @@ static void
 gtk_layout_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation)
 {
+  GtkLayout *layout = GTK_LAYOUT (widget);
   GList *tmp_list;
-  GtkLayout *layout;
-
-  g_return_if_fail (GTK_IS_LAYOUT (widget));
 
   widget->allocation = *allocation;
-  
-  layout = GTK_LAYOUT (widget);
 
   tmp_list = layout->children;
 
@@ -1035,18 +997,15 @@ gtk_layout_size_allocate (GtkWidget     *widget,
 }
 
 static gint 
-gtk_layout_expose (GtkWidget *widget, GdkEventExpose *event)
+gtk_layout_expose (GtkWidget      *widget,
+                   GdkEventExpose *event)
 {
-  GtkLayout *layout;
-
-  g_return_val_if_fail (GTK_IS_LAYOUT (widget), FALSE);
-
-  layout = GTK_LAYOUT (widget);
+  GtkLayout *layout = GTK_LAYOUT (widget);
 
   if (event->window != layout->bin_window)
     return FALSE;
   
-  (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+  (* GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event) (widget, event);
 
   return FALSE;
 }
@@ -1064,13 +1023,9 @@ static void
 gtk_layout_remove (GtkContainer *container, 
                   GtkWidget    *widget)
 {
+  GtkLayout *layout = GTK_LAYOUT (container);
   GList *tmp_list;
-  GtkLayout *layout;
   GtkLayoutChild *child = NULL;
-  
-  g_return_if_fail (GTK_IS_LAYOUT (container));
-  
-  layout = GTK_LAYOUT (container);
 
   tmp_list = layout->children;
   while (tmp_list)
@@ -1097,15 +1052,10 @@ gtk_layout_forall (GtkContainer *container,
                   GtkCallback   callback,
                   gpointer      callback_data)
 {
-  GtkLayout *layout;
+  GtkLayout *layout = GTK_LAYOUT (container);
   GtkLayoutChild *child;
   GList *tmp_list;
 
-  g_return_if_fail (GTK_IS_LAYOUT (container));
-  g_return_if_fail (callback != NULL);
-
-  layout = GTK_LAYOUT (container);
-
   tmp_list = layout->children;
   while (tmp_list)
     {
@@ -1141,10 +1091,6 @@ static void
 gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
                               GtkLayout     *layout)
 {
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (layout);
-
   if (layout->freeze_count)
     return;