All special items are now correctly displayed.

Change-Id: Ifce96d3e740a7ac89132dd23f9f51447e4372716

4 files changed, 55 insertions, 40 deletions

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d99d73a8e9b0..7dadbfca521d 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -104,6 +104,7 @@ public:
     void                        Deactivate( const gchar* aMenuCommand );
     void DisconnectFrame();
     void UpdateNativeMenu();
+//    void UpdateNativeSubMenu();
     bool PrepUpdate();
 };
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 23bfa8105a62..bf220a43f4c4 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3233,7 +3233,8 @@ void Menu::HighlightItem( sal_uInt16 nItemPos )
     }
 }
 
-void Menu::Freeze() {
+void Menu::Freeze(void)
+{
     SalMenu *pSalMenu = ImplGetSalMenu();
 
     if ( pSalMenu ) {
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
index d0837038c94f..756779a559ca 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -219,8 +219,15 @@ g_lo_action_group_change_state (GActionGroup *group,
                 g_lo_action_group_perform_submenu_action (lo_group, action_name, value);
             else
             {
+                gboolean is_new = FALSE;
+
+                /* If action already exists but has no state, it should be removed and added again. */
                 if (action->state_type == NULL)
+                {
+                    g_action_group_action_removed (G_ACTION_GROUP (group), action_name);
                     action->state_type = g_variant_type_copy (g_variant_get_type(value));
+                    is_new = TRUE;
+                }
 
                 if (g_variant_is_of_type (value, action->state_type) == TRUE)
                 {
@@ -229,7 +236,10 @@ g_lo_action_group_change_state (GActionGroup *group,
 
                     action->state = g_variant_ref (value);
 
-                    g_action_group_action_state_changed (group, action_name, value);
+                    if (is_new)
+                        g_action_group_action_added (G_ACTION_GROUP (group), action_name);
+                    else
+                        g_action_group_action_state_changed (group, action_name, value);
                 }
             }
         }
@@ -248,6 +258,9 @@ g_lo_action_group_activate (GActionGroup *group,
     GLOActionGroup *lo_group = G_LO_ACTION_GROUP (group);
     GtkSalFrame *pFrame = lo_group->priv->frame;
 
+    if ( parameter != NULL )
+        g_action_group_change_action_state( group, action_name, parameter );
+
     if ( pFrame != NULL )
     {
         GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pFrame->GetMenu() );
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index a31ab1ad44f1..43f04f51dd76 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -136,7 +136,7 @@ static void KeyCodeToGdkKey ( const KeyCode& rKeyCode, guint* pGdkKeyCode, GdkMo
 bool GtkSalMenu::PrepUpdate()
 {
     const GtkSalFrame* pFrame = GetFrame();
-    if (!pFrame)
+    if (pFrame)
     {
         const GObject* pWindow = G_OBJECT(gtk_widget_get_window( GTK_WIDGET(pFrame->getWindow()) ));
         if(!pWindow)
@@ -150,12 +150,17 @@ bool GtkSalMenu::PrepUpdate()
         {
             mpMenuModel = G_MENU_MODEL( g_object_get_data( G_OBJECT( pWindow ), "g-lo-menubar" ) );
             mpActionGroup = G_ACTION_GROUP( g_object_get_data( G_OBJECT( pWindow ), "g-lo-action-group" ) );
-        }
-        if(!mpMenuModel || !mpActionGroup)
-            return false;
+        
+            if(!mpMenuModel || !mpActionGroup)
+                return false;
+        } 
+        
         SAL_INFO("vcl.unity", "updating menu model" << mpMenuModel);
+        
         return true;
     }
+
+    return false;
 }
 
 /*
@@ -234,16 +239,16 @@ void RemoveUnusedCommands( GLOActionGroup* pActionGroup, GList* pOldCommandList,
     }
 }
 
-static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
+void GtkSalMenu::UpdateNativeMenu()
 {
-    if(!PrepUpdate())
+    if( !PrepUpdate() )
         return;
 
 //    SolarMutexGuard aGuard;
 
-    Menu* pVCLMenu = pMenu->GetMenu();
-    GLOMenu* pLOMenu = G_LO_MENU( pMenu->GetMenuModel() );
-    GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( pMenu->GetActionGroup() );
+    Menu* pVCLMenu = mpVCLMenu; // pMenu->GetMenu();
+    GLOMenu* pLOMenu = G_LO_MENU( mpMenuModel ); // G_LO_MENU( pMenu->GetMenuModel() );
+    GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup ); // G_LO_ACTION_GROUP( pMenu->GetActionGroup() );
     GList *pOldCommandList = NULL;
     GList *pNewCommandList = NULL;
 
@@ -257,11 +262,11 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
     sal_Int32 validItems = 0;
     sal_Int32 nItem;
 
-    for ( nItem = 0; nItem < ( sal_Int32 ) pMenu->GetItemCount(); nItem++ ) {
-        if ( pMenu->IsItemVisible( nItem ) == sal_False )
+    for ( nItem = 0; nItem < ( sal_Int32 ) GetItemCount(); nItem++ ) {
+        if ( IsItemVisible( nItem ) == sal_False )
             continue;
 
-        GtkSalMenuItem *pSalMenuItem = pMenu->GetItemAtPos( nItem );
+        GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem );
         sal_uInt16 nId = pSalMenuItem->mnId;
 
         if ( pSalMenuItem->mnType == MENUITEM_SEPARATOR )
@@ -337,7 +342,7 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
             NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, FALSE, TRUE );
             pNewCommandList = g_list_append( pNewCommandList, g_strdup( aNativeCommand ) );
 
-            GLOMenu* pSubMenuModel = g_lo_menu_get_submenu_from_item_in_section( pLOMenu, nSection, nItemPos );
+            //GLOMenu* pSubMenuModel = g_lo_menu_get_submenu_from_item_in_section( pLOMenu, nSection, nItemPos );
 
             if ( pSubMenuModel == NULL )
             {
@@ -347,11 +352,12 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
 
             g_object_unref( pSubMenuModel );
 
+            pSubmenu->SetMenuModel( G_MENU_MODEL( pSubMenuModel ) );
+            pSubmenu->SetActionGroup( G_ACTION_GROUP( pActionGroup ) );
+
             pSubmenu->GetMenu()->Activate();
             pSubmenu->GetMenu()->Deactivate();
 
-            pSubmenu->SetMenuModel( G_MENU_MODEL( pSubMenuModel ) );
-            pSubmenu->SetActionGroup( pActionGroup );
             pSubmenu->UpdateNativeMenu();
         }
         else if (pSubMenuModel)
@@ -364,14 +370,14 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
         ++nItemPos;
         ++validItems;
     }
-    while ( nItemPos < g_lo_menu_get_n_items_from_section( pLOMenu, nSection ) )
-        g_lo_menu_remove_from_section( pLOMenu, nSection, nItemPos );
-    ++nSection;
-    if ( nSection < g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ) )
-    {
-        SAL_INFO("vcl.unity", "nSection " << nSection << " model sections " << g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ));
-        g_lo_menu_remove(pLOMenu, nSection );
-    }
+//    while ( nItemPos < g_lo_menu_get_n_items_from_section( pLOMenu, nSection ) )
+//        g_lo_menu_remove_from_section( pLOMenu, nSection, nItemPos );
+//    ++nSection;
+//    if ( nSection < g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ) )
+//    {
+//        SAL_INFO("vcl.unity", "nSection " << nSection << " model sections " << g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ));
+//        g_lo_menu_remove(pLOMenu, nSection );
+//    }
 
     // Delete extra items in last section.
     RemoveSpareItemsFromNativeMenu( pLOMenu, &pOldCommandList, nSection, validItems );
@@ -392,20 +398,17 @@ void GtkSalMenu::DisconnectFrame()
         mpFrame = NULL;
     }
 }
-    
-void ObjectDestroyedNotify( gpointer data )
-{
-    if ( data ) {
-        g_object_unref( data );
-    }
-}
-
 
 
 /*
  * GtkSalMenu
  */
 
+//void GtkSalMenu::UpdateNativeMenu()
+//{
+//    UpdateNativeSubMenu();
+//}
+
 GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
     mbMenuBar( bMenuBar ),
     mpVCLMenu( NULL ),
@@ -419,8 +422,6 @@ GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
 GtkSalMenu::~GtkSalMenu()
 {
     if ( mbMenuBar == sal_True ) {
-//        g_source_remove_by_user_data( this );
-
         ((GtkSalFrame*) mpFrame)->SetMenu( NULL );
     }
 
@@ -499,6 +500,7 @@ const GtkSalFrame* GtkSalMenu::GetFrame() const
 void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck )
 {
     SolarMutexGuard aGuard;
+    
     if ( mpActionGroup == NULL )
         return;
 
@@ -510,9 +512,7 @@ void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItem
         GVariant *pCurrentState = g_action_group_get_action_state( mpActionGroup, aCommand );
 
         if ( bits & MIB_RADIOCHECK )
-        {
             pCheckValue = ( bCheck == TRUE ) ? g_variant_new_string( aCommand ) : g_variant_new_string( "" );
-        }
         else
         {
             // By default, all checked items are checkmark buttons.
@@ -523,7 +523,7 @@ void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItem
         if ( pCheckValue != NULL && ( pCurrentState == NULL || g_variant_equal( pCurrentState, pCheckValue ) == FALSE ) )
             g_action_group_change_action_state( mpActionGroup, aCommand, pCheckValue );
 
-        if ( pCurrentState )
+        if ( pCurrentState != NULL )
             g_variant_unref( pCurrentState );
     }
 
@@ -571,10 +571,10 @@ void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, con
 
     gchar* aAccelerator = gtk_accelerator_name( nKeyCode, nModifiers );
 
-    gchar* aCurrentAccel = g_lo_menu_get_accelerator_from_item_in_section( pMenu, nSection, nItemPos );
+    gchar* aCurrentAccel = g_lo_menu_get_accelerator_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos );
 
     if ( aCurrentAccel == NULL && g_strcmp0( aCurrentAccel, aAccelerator ) != 0 )
-        g_lo_menu_set_accelerator_to_item_in_section ( pMenu, nSection, nItemPos, aAccelerator );
+        g_lo_menu_set_accelerator_to_item_in_section ( G_LO_MENU( mpMenuModel ), nSection, nItemPos, aAccelerator );
 
     g_free( aAccelerator );
 }