aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-02 08:19:48 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:20 (GMT)
commitadf9f90af810c827fa4c849235515898733da8b6 (patch)
tree9249a2bbc26b5c9b07b78a2da53cfff81eda7904 /src/Screen.cc
parentd5bef134ea20a2670d383492977b4d152e24464a (diff)
downloadfluxbox_pavel-adf9f90af810c827fa4c849235515898733da8b6.zip
fluxbox_pavel-adf9f90af810c827fa4c849235515898733da8b6.tar.bz2
CustomMenu command now shows lua menus
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index b953c92..2f83047 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
1444void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) { 1444void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) {