diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-02 08:19:48 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:11:29 (GMT) |
commit | 82883442e7a9faf234d0a26ebc373bc4026118a1 (patch) | |
tree | ac3f64bfa05bf9febe5addf89ea1cc99906afb21 /src/Screen.cc | |
parent | dee1ec29d0db48b8a721e8152a980f1379e332af (diff) | |
download | fluxbox_paul-82883442e7a9faf234d0a26ebc373bc4026118a1.zip fluxbox_paul-82883442e7a9faf234d0a26ebc373bc4026118a1.tar.bz2 |
CustomMenu command now shows lua menus
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 43fdafe..73ccb4c 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1402,7 +1402,7 @@ void BScreen::rereadMenu() { | |||
1402 | m_rootmenu->removeAll(); | 1402 | m_rootmenu->removeAll(); |
1403 | l.loadfile(FbTk::StringUtil::expandFilename(fb->getMenuFilename()).c_str()); | 1403 | l.loadfile(FbTk::StringUtil::expandFilename(fb->getMenuFilename()).c_str()); |
1404 | l.call(0, 1); | 1404 | l.call(0, 1); |
1405 | MenuCreator::createMenu(*m_rootmenu, l, screenNumber(), m_rootmenu->reloadHelper()); | 1405 | MenuCreator::createMenu(*m_rootmenu, l, m_rootmenu->reloadHelper()); |
1406 | 1406 | ||
1407 | if (m_rootmenu->numberOfItems() == 0) { | 1407 | if (m_rootmenu->numberOfItems() == 0) { |
1408 | _FB_USES_NLS; | 1408 | _FB_USES_NLS; |
@@ -1438,7 +1438,7 @@ void BScreen::rereadWindowMenu() { | |||
1438 | m_windowmenu->removeAll(); | 1438 | m_windowmenu->removeAll(); |
1439 | l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str()); | 1439 | l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str()); |
1440 | l.call(0, 1); | 1440 | l.call(0, 1); |
1441 | MenuCreator::createMenu(*m_windowmenu, l, screenNumber(), m_windowmenu->reloadHelper()); | 1441 | MenuCreator::createMenu(*m_windowmenu, l, m_windowmenu->reloadHelper()); |
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) { | 1444 | void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) { |