summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorAntonio Fernandez <antonio.fernandez@aentos.es>2012-09-12 20:45:31 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-11-14 13:52:48 +0100
commit6b42d547cfbe87e934f65c74cb180f5f1c10c6c2 (patch)
tree8cea204a387f909f34e4210cd1fee2272b8ed55a /vcl/source
parentb789263fb7bf537cc85d3df3022282ab8f32bccb (diff)
Menus are generated on demand now, but with some issues.
Change-Id: Icec9b685e720a369cff4d2bbfc5bf4ba6614e390
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/menu.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 10bcdf66da3f..00abe068dfee 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1135,8 +1135,7 @@ void Menu::Select()
}
}
-// FIXME: Workaround to make GLOMenu without defining macros.
-//#if defined(QUARTZ)
+#if defined(QUARTZ)
void Menu::ImplSelectWithStart( Menu* pSMenu )
{
Menu* pOldStartedFrom = pStartedFrom;
@@ -1147,7 +1146,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
pOldStartedFrom->pStartedFrom = pOldStartedStarted;
pStartedFrom = pOldStartedFrom;
}
-//#endif
+#endif
void Menu::RequestHelp( const HelpEvent& )
{