commit 15436c009e756dd4c94046f9849ad5a186454af8
author Caolán McNamara <caolanm@redhat.com> Tue Jun 07 13:31:12 2016 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Jun 07 13:31:16 2016 +0100
tree ba7caa491e32aa68fa178de2797e0fb25a4e2802
parent c450705d51a4fe67d1e9391b2f78235b79766cfe

gtk3: move the updating of native menu to right after its activated

try fix that view->toolbars isn't in sync

Change-Id: I095be3003f076193878f2c3ce2a2be5acbe0e33f

framework/source/uielement/menubarmanager.cxx

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index a056be0..3007e8a44 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -479,8 +479,6 @@ throw ( RuntimeException, std::exception )
                pMenuItemHandler->xMenuItemDispatch.clear();
            }
        }
        if ( m_bHasMenuBar && !m_bActive )
            m_pVCLMenu->UpdateNativeMenu();
    }
}

vcl/unx/gtk/gtksalmenu.cxx

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index a13bb6d..19fd6a0 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1025,6 +1025,7 @@ void GtkSalMenu::Activate(const gchar* pCommand)
    Menu* pVclMenu = pSalMenu->GetMenu();
    Menu* pVclSubMenu = pVclMenu->GetPopupMenu(aMenuAndId.second);
    pTopLevel->GetMenu()->HandleMenuActivateEvent(pVclSubMenu);
    pVclSubMenu->UpdateNativeMenu();
}

void GtkSalMenu::Deactivate(const gchar* pCommand)