[maemo-commits] [maemo-commits] r9410 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-29 15:03:23 +0200 (Mon, 29 Jan 2007)
New Revision: 9410

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
Log:
2007-01-29  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenu.c (gtk_menu_init): port over changing the window
	type from POPUP to TOPLEVEL and setting GDK_WINDOW_TYPE_HINT_MENU.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-29 12:28:50 UTC (rev 9409)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-29 13:03:23 UTC (rev 9410)
@@ -1,3 +1,8 @@
+2007-01-29  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenu.c (gtk_menu_init): port over changing the window
+	type from POPUP to TOPLEVEL and setting GDK_WINDOW_TYPE_HINT_MENU.
+
 2007-01-28  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtkimmulticontext.c: conditionalize with MAEMO_CHANGES.

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-01-29 12:28:50 UTC (rev 9409)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-01-29 13:03:23 UTC (rev 9410)
@@ -867,13 +867,22 @@
   menu->toggle_size = 0;
 
   menu->toplevel = g_object_connect (g_object_new (GTK_TYPE_WINDOW,
+#ifdef MAEMO_CHANGES
+                                                   "type", GTK_WINDOW_TOPLEVEL,
+#else
 						   "type", GTK_WINDOW_POPUP,
+#endif /* MAEMO_CHANGES */
 						   "child", menu,
 						   NULL),
 				     "signal::event", gtk_menu_window_event, menu,
 				     "signal::size_request", gtk_menu_window_size_request, menu,
 				     "signal::destroy", gtk_widget_destroyed, &menu->toplevel,
 				     NULL);
+#ifdef MAEMO_CHANGES
+  gtk_window_set_decorated (GTK_WINDOW (menu->toplevel), FALSE);
+  gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel),
+                            GDK_WINDOW_TYPE_HINT_MENU);
+#endif /* MAEMO_CHANGES */
   gtk_window_set_resizable (GTK_WINDOW (menu->toplevel), FALSE);
   gtk_window_set_mnemonic_modifier (GTK_WINDOW (menu->toplevel), 0);