Use gtk_box_new() instead gtk_[v|h]box_new()

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

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index ee02d3b356429e2914c86d60ba8fa93b7874463a..f36a9d5548c25b90cad7f3f5a9bd26238aa7f136 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -44,9 +44,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#define DEFAULT_POPUP_DELAY     225
-#define DEFAULT_POPDOWN_DELAY  1000
-
 #define NAVIGATION_REGION_OVERSHOOT 50  /* How much the navigation region
                                         * extends below the submenu
                                         */
@@ -241,7 +238,6 @@ static void     gtk_menu_set_submenu_navigation_region (GtkMenu          *menu,
  
 static void gtk_menu_deactivate            (GtkMenuShell      *menu_shell);
 static void gtk_menu_show_all       (GtkWidget         *widget);
-static void gtk_menu_hide_all       (GtkWidget         *widget);
 static void gtk_menu_position       (GtkMenu           *menu);
 static void gtk_menu_reparent       (GtkMenu           *menu, 
                                     GtkWidget         *new_parent, 
@@ -479,7 +475,6 @@ gtk_menu_class_init (GtkMenuClass *class)
   widget_class->button_release_event = gtk_menu_button_release;
   widget_class->motion_notify_event = gtk_menu_motion_notify;
   widget_class->show_all = gtk_menu_show_all;
-  widget_class->hide_all = gtk_menu_hide_all;
   widget_class->enter_notify_event = gtk_menu_enter_notify;
   widget_class->leave_notify_event = gtk_menu_leave_notify;
   widget_class->style_set = gtk_menu_style_set;
@@ -819,28 +814,6 @@ gtk_menu_class_init (GtkMenuClass *class)
                                GTK_TYPE_SCROLL_TYPE,
                                GTK_SCROLL_PAGE_DOWN);
 
-  gtk_settings_install_property (g_param_spec_boolean ("gtk-can-change-accels",
-                                                      P_("Can change accelerators"),
-                                                      P_("Whether menu accelerators can be changed by pressing a key over the menu item"),
-                                                      FALSE,
-                                                      GTK_PARAM_READWRITE));
-
-  gtk_settings_install_property (g_param_spec_int ("gtk-menu-popup-delay",
-                                                  P_("Delay before submenus appear"),
-                                                  P_("Minimum time the pointer must stay over a menu item before the submenu appear"),
-                                                  0,
-                                                  G_MAXINT,
-                                                  DEFAULT_POPUP_DELAY,
-                                                  GTK_PARAM_READWRITE));
-
-  gtk_settings_install_property (g_param_spec_int ("gtk-menu-popdown-delay",
-                                                  P_("Delay before hiding a submenu"),
-                                                  P_("The time before hiding a submenu when the pointer is moving towards the submenu"),
-                                                  0,
-                                                  G_MAXINT,
-                                                  DEFAULT_POPDOWN_DELAY,
-                                                  GTK_PARAM_READWRITE));
-
   g_type_class_add_private (gobject_class, sizeof (GtkMenuPrivate));
 }
 
@@ -2185,22 +2158,20 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
              if (toplevel != NULL)
                gtk_window_set_transient_for (GTK_WINDOW (menu->tearoff_window),
                                              GTK_WINDOW (toplevel));
-             
-             menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE);
+
+             menu->tearoff_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
              gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox);
 
               height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (menu)));
-              menu->tearoff_adjustment =
-               GTK_ADJUSTMENT (gtk_adjustment_new (0,
-                                                   0,
-                                                   priv->requested_height,
-                                                   MENU_SCROLL_STEP2,
-                                                   height/2,
-                                                   height));
+              menu->tearoff_adjustment = gtk_adjustment_new (0,
+                                                             0, priv->requested_height,
+                                                             MENU_SCROLL_STEP2,
+                                                             height/2,
+                                                             height);
              g_object_connect (menu->tearoff_adjustment,
                                "signal::value-changed", gtk_menu_scrollbar_changed, menu,
                                NULL);
-             menu->tearoff_scrollbar = gtk_vscrollbar_new (menu->tearoff_adjustment);
+             menu->tearoff_scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, menu->tearoff_adjustment);
 
              gtk_box_pack_end (GTK_BOX (menu->tearoff_hbox),
                                menu->tearoff_scrollbar,
@@ -5138,14 +5109,6 @@ gtk_menu_show_all (GtkWidget *widget)
   gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback) gtk_widget_show_all, NULL);
 }
 
-
-static void
-gtk_menu_hide_all (GtkWidget *widget)
-{
-  /* Hide children, but not self. */
-  gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback) gtk_widget_hide_all, NULL);
-}
-
 /**
  * gtk_menu_set_screen:
  * @menu: a #GtkMenu.
@@ -5476,7 +5439,7 @@ get_menu_height (GtkMenu *menu)
   gtk_widget_get_allocation (widget, &allocation);
 
   height = allocation.height;
-  height -= gtk_container_get_border_width (GTK_CONTAINER (widget) + gtk_widget_get_style (widget)->ythickness) * 2;
+  height -= (gtk_container_get_border_width (GTK_CONTAINER (widget)) + gtk_widget_get_style (widget)->ythickness) * 2;
 
   if (!menu->tearoff_active)
     {