diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-02 08:19:48 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2013-02-17 00:09:35 (GMT) |
commit | 66c32707aa0d66aab276fc2230f5a083775d8cc3 (patch) | |
tree | 81326229736db391f7af9390a44a248fe408aa9e /src/Screen.cc | |
parent | 3e47dab917a73653686ed3e6bef0d58d917cc65b (diff) | |
download | fluxbox_pavel-66c32707aa0d66aab276fc2230f5a083775d8cc3.zip fluxbox_pavel-66c32707aa0d66aab276fc2230f5a083775d8cc3.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 8a3ad2a..ae31806 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1421,7 +1421,7 @@ void BScreen::rereadMenu() { | |||
1421 | m_rootmenu->removeAll(); | 1421 | m_rootmenu->removeAll(); |
1422 | l.loadfile(FbTk::StringUtil::expandFilename(fb->getMenuFilename()).c_str()); | 1422 | l.loadfile(FbTk::StringUtil::expandFilename(fb->getMenuFilename()).c_str()); |
1423 | l.call(0, 1); | 1423 | l.call(0, 1); |
1424 | MenuCreator::createMenu(*m_rootmenu, l, screenNumber(), m_rootmenu->reloadHelper()); | 1424 | MenuCreator::createMenu(*m_rootmenu, l, m_rootmenu->reloadHelper()); |
1425 | 1425 | ||
1426 | if (m_rootmenu->numberOfItems() == 0) { | 1426 | if (m_rootmenu->numberOfItems() == 0) { |
1427 | _FB_USES_NLS; | 1427 | _FB_USES_NLS; |
@@ -1457,7 +1457,7 @@ void BScreen::rereadWindowMenu() { | |||
1457 | m_windowmenu->removeAll(); | 1457 | m_windowmenu->removeAll(); |
1458 | l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str()); | 1458 | l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str()); |
1459 | l.call(0, 1); | 1459 | l.call(0, 1); |
1460 | MenuCreator::createMenu(*m_windowmenu, l, screenNumber(), m_windowmenu->reloadHelper()); | 1460 | MenuCreator::createMenu(*m_windowmenu, l, m_windowmenu->reloadHelper()); |
1461 | } | 1461 | } |
1462 | 1462 | ||
1463 | void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) { | 1463 | void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) { |