AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

add gtk_menu_style_set(). fixes #79345

Browse Source 
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
This commit is contained in:
Soeren Sandmann 2002-05-30 06:05:42 +00:00 committed by Søren Sandmann Pedersen
parent b179b6af11
commit 25e0ae0186
17 changed files with 126 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

5
ChangeLog.pre-2-10
View File

@ -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.

5
ChangeLog.pre-2-2
View File

@ -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.

5
ChangeLog.pre-2-4
View File

@ -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.

5
ChangeLog.pre-2-6
View File

@ -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.

5
ChangeLog.pre-2-8
View File

@ -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.

20
docs/reference/gtk/tmpl/gtkbbox.sgml
View File

@ -162,16 +162,6 @@ box.
</para>
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
<para>
@ -182,3 +172,13 @@ box.
</para>
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
<para>
</para>

20
docs/reference/gtk/tmpl/gtkbutton.sgml
View File

@ -248,16 +248,6 @@ mouse cursor is.
</para>
<!-- ##### ARG GtkButton:child-displacement-y ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:child-displacement-x ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:default-border ##### -->
<para>
@ -268,3 +258,13 @@ mouse cursor is.
</para>
<!-- ##### ARG GtkButton:child-displacement-y ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:child-displacement-x ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtkcheckbutton.sgml
View File

@ -66,13 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
@Returns:
<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
<para>
</para>
<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
<para>
</para>

4
docs/reference/gtk/tmpl/gtkdialog.sgml
View File

@ -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>

10
docs/reference/gtk/tmpl/gtkoptionmenu.sgml
View File

@ -100,13 +100,13 @@ selected value for the option menu.
</para>
<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
<para>
</para>
<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
<para>
</para>

30
docs/reference/gtk/tmpl/gtkrange.sgml
View File

@ -153,6 +153,21 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:stepper-size ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:slider-width ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
<para>
@ -168,18 +183,3 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:stepper-size ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:slider-width ##### -->
<para>
</para>

14
docs/reference/gtk/tmpl/gtkscrollbar.sgml
View File

@ -54,7 +54,12 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<para>
</para>
@ -64,7 +69,7 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<para>
</para>
@ -79,8 +84,3 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>

14
docs/reference/gtk/tmpl/gtktoolbar.sgml
View File

@ -386,12 +386,7 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:space-size ##### -->
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<para>
</para>
@ -401,12 +396,17 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:internal-padding ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<!-- ##### ARG GtkToolbar:space-size ##### -->
<para>
</para>

4
docs/reference/gtk/tmpl/gtktreeview.sgml
View File

@ -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>

30
docs/reference/gtk/tmpl/gtkwidget.sgml
View File

@ -2187,26 +2187,11 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:interior-focus ##### -->
<para>
@ -2217,8 +2202,23 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>

18
gtk/gtkmenu.c
View File

@ -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)
{