Fixed signal marshaller in GtkToolbar.

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

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 3d851ddd21124c6753afd93b21b35f234cf5ca0d..65caaab22889eaf3ec4fd84a831c719951a86c89 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -81,8 +81,6 @@ static void gtk_toolbar_get_property             (GObject         *object,
                                                  GValue          *value,
                                                  GParamSpec      *pspec);
 static void gtk_toolbar_destroy                  (GtkObject       *object);
-static void gtk_toolbar_map                      (GtkWidget       *widget);
-static void gtk_toolbar_unmap                    (GtkWidget       *widget);
 static gint gtk_toolbar_expose                   (GtkWidget       *widget,
                                                  GdkEventExpose  *event);
 static void gtk_toolbar_size_request             (GtkWidget       *widget,
@@ -188,8 +186,6 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
   gobject_class->set_property = gtk_toolbar_set_property;
   gobject_class->get_property = gtk_toolbar_get_property;
 
-  widget_class->map = gtk_toolbar_map;
-  widget_class->unmap = gtk_toolbar_unmap;
   widget_class->expose_event = gtk_toolbar_expose;
   widget_class->size_request = gtk_toolbar_size_request;
   widget_class->size_allocate = gtk_toolbar_size_allocate;
@@ -209,17 +205,17 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed),
-                   gtk_marshal_VOID__INT,
+                   gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_INT);
+                   GTK_TYPE_ORIENTATION);
   toolbar_signals[STYLE_CHANGED] =
     gtk_signal_new ("style_changed",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed),
-                   gtk_marshal_VOID__INT,
+                   gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_INT);
+                   GTK_TYPE_TOOLBAR_STYLE);
   
   g_object_class_install_property (gobject_class,
                                   PROP_ORIENTATION,
@@ -472,50 +468,6 @@ gtk_toolbar_destroy (GtkObject *object)
   GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
-static void
-gtk_toolbar_map (GtkWidget *widget)
-{
-  GtkToolbar *toolbar;
-  GList *children;
-  GtkToolbarChild *child;
-
-  g_return_if_fail (GTK_IS_TOOLBAR (widget));
-
-  toolbar = GTK_TOOLBAR (widget);
-  GTK_WIDGET_SET_FLAGS (toolbar, GTK_MAPPED);
-
-  for (children = toolbar->children; children; children = children->next)
-    {
-      child = children->data;
-
-      if ((child->type != GTK_TOOLBAR_CHILD_SPACE)
-         && GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
-       gtk_widget_map (child->widget);
-    }
-}
-
-static void
-gtk_toolbar_unmap (GtkWidget *widget)
-{
-  GtkToolbar *toolbar;
-  GList *children;
-  GtkToolbarChild *child;
-
-  g_return_if_fail (GTK_IS_TOOLBAR (widget));
-
-  toolbar = GTK_TOOLBAR (widget);
-  GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_MAPPED);
-
-  for (children = toolbar->children; children; children = children->next)
-    {
-      child = children->data;
-
-      if ((child->type != GTK_TOOLBAR_CHILD_SPACE)
-         && GTK_WIDGET_VISIBLE (child->widget) && GTK_WIDGET_MAPPED (child->widget))
-       gtk_widget_unmap (child->widget);
-    }
-}
-
 static void
 gtk_toolbar_paint_space_line (GtkWidget       *widget,
                              GdkRectangle    *area,
@@ -1436,20 +1388,7 @@ gtk_toolbar_internal_insert_element (GtkToolbar          *toolbar,
   toolbar->num_children++;
 
   if (type != GTK_TOOLBAR_CHILD_SPACE)
-    {
-      gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar));
-
-      if (GTK_WIDGET_REALIZED (child->widget->parent))
-       gtk_widget_realize (child->widget);
-
-      if (GTK_WIDGET_VISIBLE (child->widget->parent) && GTK_WIDGET_VISIBLE (child->widget))
-       {
-         if (GTK_WIDGET_MAPPED (child->widget->parent))
-           gtk_widget_map (child->widget);
-
-         gtk_widget_queue_resize (child->widget);
-       }
-    }
+    gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar));
   else
     gtk_widget_queue_resize (GTK_WIDGET (toolbar));
 
@@ -1649,7 +1588,7 @@ gtk_real_toolbar_style_changed (GtkToolbar      *toolbar,
                if (child->label && !GTK_WIDGET_VISIBLE (child->label))
                  gtk_widget_show (child->label);
 
-               box = (GtkWidget*)gtk_container_children (GTK_CONTAINER (child->widget))->data;
+               box = (GtkWidget*)gtk_container_get_children (GTK_CONTAINER (child->widget))->data;
 
                if (GTK_IS_HBOX (box))
                {
@@ -1693,7 +1632,7 @@ gtk_real_toolbar_style_changed (GtkToolbar      *toolbar,
                if (child->label && !GTK_WIDGET_VISIBLE (child->label))
                  gtk_widget_show (child->label);
 
-               box = (GtkWidget*)gtk_container_children (GTK_CONTAINER (child->widget))->data;
+               box = (GtkWidget*)gtk_container_get_children (GTK_CONTAINER (child->widget))->data;
                
                if (GTK_IS_VBOX (box))
                {