add gtk_menu_style_set(). fixes #79345

Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkmenu.c (gtk_menu_style_set): add
	gtk_menu_style_set(). fixes #79345

diff --git a/ChangeLog b/ChangeLog
index 5e32cf321b62e15bc83048d1903d17998ddfdcf7..bcb7b38a0d5fbedd0083f58a76990f596c21391f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_style_set): add
+       gtk_menu_style_set(). fixes #79345
+
 2002-05-29  Dave Camp  <dave@ximian.com>
 
        * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5e32cf321b62e15bc83048d1903d17998ddfdcf7..bcb7b38a0d5fbedd0083f58a76990f596c21391f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_style_set): add
+       gtk_menu_style_set(). fixes #79345
+
 2002-05-29  Dave Camp  <dave@ximian.com>
 
        * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5e32cf321b62e15bc83048d1903d17998ddfdcf7..bcb7b38a0d5fbedd0083f58a76990f596c21391f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_style_set): add
+       gtk_menu_style_set(). fixes #79345
+
 2002-05-29  Dave Camp  <dave@ximian.com>
 
        * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5e32cf321b62e15bc83048d1903d17998ddfdcf7..bcb7b38a0d5fbedd0083f58a76990f596c21391f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_style_set): add
+       gtk_menu_style_set(). fixes #79345
+
 2002-05-29  Dave Camp  <dave@ximian.com>
 
        * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5e32cf321b62e15bc83048d1903d17998ddfdcf7..bcb7b38a0d5fbedd0083f58a76990f596c21391f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_style_set): add
+       gtk_menu_style_set(). fixes #79345
+
 2002-05-29  Dave Camp  <dave@ximian.com>
 
        * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5e32cf321b62e15bc83048d1903d17998ddfdcf7..bcb7b38a0d5fbedd0083f58a76990f596c21391f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu May 30 07:59:38 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_style_set): add
+       gtk_menu_style_set(). fixes #79345
+
 2002-05-29  Dave Camp  <dave@ximian.com>
 
        * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.

diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index 07898918d50161ff27bfe6b672bf4f42887d0f63..ceec7a0916bed1d2b8e1da84b71e5065c3d576ab 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -162,22 +162,22 @@ box.
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index 87becea1c83065829824c6f18ee019efff049ced..d3aa683082607cedffdb34511a1cf101bd16d294 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -248,22 +248,22 @@ mouse cursor is.
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-y ##### -->
+<!-- ##### ARG GtkButton:default-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-x ##### -->
+<!-- ##### ARG GtkButton:default-outside-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:default-border ##### -->
+<!-- ##### ARG GtkButton:child-displacement-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:default-outside-border ##### -->
+<!-- ##### ARG GtkButton:child-displacement-x ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
index 9f985152d954bb99c20b638ceec6914e805a8fff..7b5e72c6ada3cfeb88b40f00229455ffcc20b2a4 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
@@ -66,12 +66,12 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
 @Returns: 
 
 
-<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
+<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
+<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 67d4957dd6590966a14ad5859800c57e85f6f34a..6a113643a3d22eb2283f3c131fa6eb0e93d0918f 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -298,12 +298,12 @@ was clicked.
 
 </para>
 
-<!-- ##### ARG GtkDialog:button-spacing ##### -->
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<!-- ##### ARG GtkDialog:button-spacing ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 876a046a5d08d5130023c2f4298d3111263a7037..31debc57f83ac7dc9e013263c3a9c1b3a61fea7b 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -100,12 +100,12 @@ selected value for the option menu.
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index f6bd73f129fb9c58d419e881dcbdac34cd325aec..8f4f787e29591fc55f1e2bd7db200795f04f1246 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -153,32 +153,32 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
+<!-- ##### ARG GtkRange:stepper-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
+<!-- ##### ARG GtkRange:slider-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:trough-border ##### -->
+<!-- ##### ARG GtkRange:stepper-spacing ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-spacing ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-size ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:slider-width ##### -->
+<!-- ##### ARG GtkRange:trough-border ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index 48f51f9d5747b63371a2bab9666c476dfcd331fa..cc947c106ee48651bb481a8f24559d870e2e2c55 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -54,32 +54,32 @@ The #GtkScrollbar struct does not contain any public data.
 </para>
 
 
-<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index c6cbbe3734d23cfee16f04458ae70a5f8546f599..9ebf2d6d86dee78426ebceb9f971dd573f225b66 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -386,17 +386,17 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
-<!-- ##### ARG GtkToolbar:button-relief ##### -->
+<!-- ##### ARG GtkToolbar:shadow-type ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-size ##### -->
+<!-- ##### ARG GtkToolbar:space-style ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-style ##### -->
+<!-- ##### ARG GtkToolbar:button-relief ##### -->
 <para>
 
 </para>
@@ -406,7 +406,7 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
-<!-- ##### ARG GtkToolbar:shadow-type ##### -->
+<!-- ##### ARG GtkToolbar:space-size ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index e43538a1db94eb5d551b6baf462183fd377dc100..b8d73fe9c8800c206157e1652cafda502da87b37 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -901,7 +901,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:allow-rules ##### -->
+<!-- ##### ARG GtkTreeView:expander-size ##### -->
 <para>
 
 </para>
@@ -911,7 +911,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:expander-size ##### -->
+<!-- ##### ARG GtkTreeView:allow-rules ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 7fc099e49b919fbe70c87cb96fa889141945e5d5..eb1d2421799faae8acec635774788921396f9d2c 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -2187,37 +2187,37 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
+<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
+<!-- ##### ARG GtkWidget:focus-padding ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-color ##### -->
+<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<!-- ##### ARG GtkWidget:cursor-color ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-padding ##### -->
+<!-- ##### ARG GtkWidget:focus-line-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-width ##### -->
+<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
 <para>
 
 </para>

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 4aa417262aa8b6e27d641536c304edc0f6098f79..9999193dea1f925f7a3f1bd60026566bd894debc 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -113,6 +113,9 @@ static void     gtk_menu_handle_scrolling  (GtkMenu          *menu,
                                            gboolean         enter);
 static void     gtk_menu_set_tearoff_hints (GtkMenu          *menu,
                                            gint             width);
+static void     gtk_menu_style_set         (GtkWidget        *widget,
+                                           GtkStyle         *previous_style);
+
 
 static void     gtk_menu_stop_navigating_submenu       (GtkMenu          *menu);
 static gboolean gtk_menu_stop_navigating_submenu_cb    (gpointer          user_data);
@@ -206,6 +209,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   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;
 
   container_class->remove = gtk_menu_remove;
   
@@ -1260,6 +1264,20 @@ gtk_menu_reorder_child (GtkMenu   *menu,
     }   
 }
 
+static void
+gtk_menu_style_set (GtkWidget *widget,
+                   GtkStyle  *previous_style)
+{
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      GtkMenu *menu = GTK_MENU (widget);
+      
+      gtk_style_set_background (widget->style, menu->bin_window, GTK_STATE_NORMAL);
+      gtk_style_set_background (widget->style, menu->view_window, GTK_STATE_NORMAL);
+      gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+    }
+}
+
 static void
 gtk_menu_realize (GtkWidget *widget)
 {