Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add gtk_menu_style_set(). Fixes #79345.

Browse Source 
Thu May 30 07:12:02 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 05:12:30 +00:00
committed by Søren Sandmann Pedersen
parent 05f883f5b6
commit 0a474992c2
9 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
Thu May 30 07:12:02 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c (gtk_menu_style_set): add
gtk_menu_style_set(). Fixes #79345.
2002-05-30 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c (gdk_screen_width_mm,

5
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
Thu May 30 07:12:02 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c (gtk_menu_style_set): add
gtk_menu_style_set(). Fixes #79345.
2002-05-30 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c (gdk_screen_width_mm,

5
ChangeLog.pre-2-2
View File

@@ -1,3 +1,8 @@
Thu May 30 07:12:02 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c (gtk_menu_style_set): add
gtk_menu_style_set(). Fixes #79345.
2002-05-30 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c (gdk_screen_width_mm,

5
ChangeLog.pre-2-4
View File

@@ -1,3 +1,8 @@
Thu May 30 07:12:02 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c (gtk_menu_style_set): add
gtk_menu_style_set(). Fixes #79345.
2002-05-30 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c (gdk_screen_width_mm,

5
ChangeLog.pre-2-6
View File

@@ -1,3 +1,8 @@
Thu May 30 07:12:02 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c (gtk_menu_style_set): add
gtk_menu_style_set(). Fixes #79345.
2002-05-30 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c (gdk_screen_width_mm,

5
ChangeLog.pre-2-8
View File

@@ -1,3 +1,8 @@
Thu May 30 07:12:02 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c (gtk_menu_style_set): add
gtk_menu_style_set(). Fixes #79345.
2002-05-30 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c (gdk_screen_width_mm,

1
docs/reference/gdk/tmpl/windows.sgml
View File

@@ -245,7 +245,6 @@ the @window_at_pointer function in #GdkPointerHooks. It will be used
when GDK gets multihead support.
</para>
@parent_instance:
<!-- ##### FUNCTION gdk_window_new ##### -->
<para>

19
gdk/gdkwindow.c
View File

@@ -2124,7 +2124,10 @@ gdk_window_process_all_updates (void)
{
GSList *old_update_windows = update_windows;
GSList *tmp_list = update_windows;
static GTimer *timer;
static double last_time;
double now;
if (update_idle)
g_source_remove (update_idle);
@@ -2142,7 +2145,19 @@ gdk_window_process_all_updates (void)
g_slist_free (old_update_windows);
gdk_flush();
if (!timer)
timer = g_timer_new ();
now = g_timer_elapsed (timer, NULL);
if (last_time != -1)
g_print ("approximate frame rate: %f\n", 1.0 / (now - last_time));
last_time = now;
#if 0
XFlush (gdk_display);
#endif
#if 0
gdk_flush ();
#endif
}
static gboolean

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;
@@ -1241,6 +1245,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)
{