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-07-02 08:19:48 (GMT)
commitc56da3e3ddce80f4e33a55a122611db8debcc8a5 (patch)
tree9c294c079a4469709e08b4f9aebe5835189464e8 /src/Screen.cc
parentf61f4d830eefff411889d9b3c1dfaa2ef95ee05d (diff)
downloadfluxbox_pavel-c56da3e3ddce80f4e33a55a122611db8debcc8a5.zip
fluxbox_pavel-c56da3e3ddce80f4e33a55a122611db8debcc8a5.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 7b81469..ca12cb3 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1410,7 +1410,7 @@ void BScreen::rereadMenu() {
1410 m_rootmenu->removeAll(); 1410 m_rootmenu->removeAll();
1411 l.loadfile(FbTk::StringUtil::expandFilename(fb->getMenuFilename()).c_str()); 1411 l.loadfile(FbTk::StringUtil::expandFilename(fb->getMenuFilename()).c_str());
1412 l.call(0, 1); 1412 l.call(0, 1);
1413 MenuCreator::createMenu(*m_rootmenu, l, screenNumber(), m_rootmenu->reloadHelper()); 1413 MenuCreator::createMenu(*m_rootmenu, l, m_rootmenu->reloadHelper());
1414 1414
1415 if (m_rootmenu->numberOfItems() == 0) { 1415 if (m_rootmenu->numberOfItems() == 0) {
1416 _FB_USES_NLS; 1416 _FB_USES_NLS;
@@ -1446,7 +1446,7 @@ void BScreen::rereadWindowMenu() {
1446 m_windowmenu->removeAll(); 1446 m_windowmenu->removeAll();
1447 l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str()); 1447 l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str());
1448 l.call(0, 1); 1448 l.call(0, 1);
1449 MenuCreator::createMenu(*m_windowmenu, l, screenNumber(), m_windowmenu->reloadHelper()); 1449 MenuCreator::createMenu(*m_windowmenu, l, m_windowmenu->reloadHelper());
1450} 1450}
1451 1451
1452void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) { 1452void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) {