summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorAntonio Fernandez <antonio.fernandez@aentos.es>2012-08-09 15:58:03 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-11-14 13:52:40 +0100
commitd687291aa9bc66929471e7b07188c4fcd1ba591b (patch)
tree96260e55be6d96408c3cc9cfe0d23586d626c31b /vcl/source
parente61bb047cb7056329ee768f788d22e7db5602b85 (diff)
Most actions seem to work now. Enabled ImplSelectWithStart() for all builds.
Change-Id: Ib309112de07d125fbe3b61ea20d5e26d1016912b
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/menu.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e713b1696c3e..d33f4c4a52f6 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1135,7 +1135,8 @@ void Menu::Select()
}
}
-#if defined(QUARTZ)
+// FIXME: Workaround to make GLOMenu without defining macros.
+//#if defined(QUARTZ)
void Menu::ImplSelectWithStart( Menu* pSMenu )
{
Menu* pOldStartedFrom = pStartedFrom;
@@ -1146,7 +1147,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
pOldStartedFrom->pStartedFrom = pOldStartedStarted;
pStartedFrom = pOldStartedFrom;
}
-#endif
+//#endif
void Menu::RequestHelp( const HelpEvent& )
{