summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-16 10:42:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-16 10:42:32 +0100
commit8c82dfe085ec0a7c27123927743387ecd8406846 (patch)
tree737a6e5c7cbfff6a6067e55239e69ceccc7f8778
parenta30e3ea231dd1a355e616fed33eb7c4c4866c12c (diff)
it would seem safer to update before HandleMenuDeActivateEvent
i.e. Activate, Update and Deactivate Change-Id: I707f6801fca39bb767e49d6af0b9b3ceccb25e94
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 78d337a14fe2..03b9b7067687 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)