[Libreoffice-commits] .: Branch 'feature/unitymenus-quantal' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk/window/gtksalmenu.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 1797f17c9f402edcd098f6942b6c32c9bee23467
Author: Antonio Fernandez <antonio.fernandez at aentos.es>
Date:   Mon Oct 15 18:16:39 2012 +0100

    Menus now work properly when opening an application from LO's main screen.
    
    Change-Id: Ib4947f5b48f508d66beab6952098c8d27e03ad21

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 2dfed29..b9d9325 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -474,9 +474,12 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
     mpFrame = static_cast< const GtkSalFrame* >( pFrame );
 
     // Clean menu model and action group if needed.
-    GObject* pWindow = G_OBJECT( pFrameNonConst->getWindow() );
-    GLOMenu* pMenuModel = G_LO_MENU( g_object_get_data( pWindow, "g-lo-menubar" ) );
-    GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( g_object_get_data( pWindow, "g-lo-action-group" ) );
+//    GObject* pWindow = G_OBJECT( pFrameNonConst->getWindow() );
+    GtkWidget* pWidget = pFrameNonConst->getWindow();
+    GdkWindow* gdkWindow = gtk_widget_get_window( pWidget );
+
+    GLOMenu* pMenuModel = G_LO_MENU( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) );
+    GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-action-group" ) );
 
     if ( pMenuModel && g_menu_model_get_n_items( G_MENU_MODEL( pMenuModel ) ) > 0 )
         g_lo_menu_remove( pMenuModel, 0 );