diff --git a/ChangeLog b/ChangeLog index 5e32cf321b..bcb7b38a0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 30 07:59:38 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_style_set): add + gtk_menu_style_set(). fixes #79345 + 2002-05-29 Dave Camp * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5e32cf321b..bcb7b38a0d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu May 30 07:59:38 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_style_set): add + gtk_menu_style_set(). fixes #79345 + 2002-05-29 Dave Camp * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5e32cf321b..bcb7b38a0d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu May 30 07:59:38 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_style_set): add + gtk_menu_style_set(). fixes #79345 + 2002-05-29 Dave Camp * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5e32cf321b..bcb7b38a0d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu May 30 07:59:38 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_style_set): add + gtk_menu_style_set(). fixes #79345 + 2002-05-29 Dave Camp * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5e32cf321b..bcb7b38a0d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu May 30 07:59:38 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_style_set): add + gtk_menu_style_set(). fixes #79345 + 2002-05-29 Dave Camp * gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5e32cf321b..bcb7b38a0d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu May 30 07:59:38 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_style_set): add + gtk_menu_style_set(). fixes #79345 + 2002-05-29 Dave Camp * 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 07898918d5..ceec7a0916 100644 --- a/docs/reference/gtk/tmpl/gtkbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbbox.sgml @@ -162,16 +162,6 @@ box. - - - - - - - - - - @@ -182,3 +172,13 @@ box. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index 87becea1c8..d3aa683082 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -248,16 +248,6 @@ mouse cursor is. - - - - - - - - - - @@ -268,3 +258,13 @@ mouse cursor is. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 9f985152d9..7b5e72c6ad 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -66,13 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index 67d4957dd6..6a113643a3 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -298,12 +298,12 @@ was clicked. - + - + diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 876a046a5d..31debc57f8 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -100,13 +100,13 @@ selected value for the option menu. - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index f6bd73f129..8f4f787e29 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -153,6 +153,21 @@ Emitted when the range value changes. + + + + + + + + + + + + + + + @@ -168,18 +183,3 @@ Emitted when the range value changes. - - - - - - - - - - - - - - - diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml index 48f51f9d57..cc947c106e 100644 --- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml @@ -54,7 +54,12 @@ The #GtkScrollbar struct does not contain any public data. - + + + + + + @@ -64,7 +69,7 @@ The #GtkScrollbar struct does not contain any public data. - + @@ -79,8 +84,3 @@ The #GtkScrollbar struct does not contain any public data. - - - - - diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index c6cbbe3734..9ebf2d6d86 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -386,12 +386,7 @@ Should be used if you wish to perform an action when ever the style of a toolbar - - - - - - + @@ -401,12 +396,17 @@ Should be used if you wish to perform an action when ever the style of a toolbar + + + + + - + diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index e43538a1db..b8d73fe9c8 100644 --- 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. - + @@ -911,7 +911,7 @@ Function used for #gtk_tree_view_map_expanded_rows. - + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 7fc099e49b..eb1d242179 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -2187,26 +2187,11 @@ a widget changes from un-anchored to anchored or vice-versa. - - - - - - - - - - - - - - - @@ -2217,8 +2202,23 @@ a widget changes from un-anchored to anchored or vice-versa. + + + + + + + + + + + + + + + diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 4aa417262a..9999193dea 100644 --- 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) {