[Libreoffice-commits] core.git: vcl/unx
Caolán McNamara
caolanm at redhat.com
Mon May 16 09:47:14 UTC 2016
vcl/unx/gtk/gtksalmenu.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 8c82dfe085ec0a7c27123927743387ecd8406846
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 16 10:42:32 2016 +0100
it would seem safer to update before HandleMenuDeActivateEvent
i.e. Activate, Update and Deactivate
Change-Id: I707f6801fca39bb767e49d6af0b9b3ceccb25e94
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 78d337a..03b9b70 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -992,16 +992,15 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
void GtkSalMenu::ActivateAllSubmenus(Menu* pMenuBar)
{
pMenuBar->HandleMenuActivateEvent(mpVCLMenu);
- pMenuBar->HandleMenuDeActivateEvent(mpVCLMenu);
for (GtkSalMenuItem* pSalItem : maItems)
{
if ( pSalItem->mpSubMenu != nullptr )
{
pSalItem->mpSubMenu->ActivateAllSubmenus(pMenuBar);
- pSalItem->mpSubMenu->Update();
}
}
Update();
+ pMenuBar->HandleMenuDeActivateEvent(mpVCLMenu);
}
void GtkSalMenu::Activate(const gchar* pCommand)
More information about the Libreoffice-commits
mailing list