aboutsummaryrefslogtreecommitdiff
path: root/src/MenuCreator.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-08-15 21:03:57 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 10:04:02 (GMT)
commit698a4af938737295494dade50950d1aeebc8b55d (patch)
tree075017c3a59ac2575f708d223cf2391e82b9eb69 /src/MenuCreator.cc
parent678a98de943963e993827540496741ae814af8bd (diff)
downloadfluxbox_pavel-698a4af938737295494dade50950d1aeebc8b55d.zip
fluxbox_pavel-698a4af938737295494dade50950d1aeebc8b55d.tar.bz2
Move declarations of Resource enums to a separate file
The reason for this is that I need to access those enums from fluxbox-update_configs and I don't want to #include and link everything in src. I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.
Diffstat (limited to 'src/MenuCreator.cc')
-rw-r--r--src/MenuCreator.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 56b90c0..536a5bc 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -343,7 +343,7 @@ FbMenu *MenuCreator::createMenu(const string &label, int screen_number) {
343 343
344 FbMenu *menu = new FbMenu(screen->menuTheme(), 344 FbMenu *menu = new FbMenu(screen->menuTheme(),
345 screen->imageControl(), 345 screen->imageControl(),
346 *screen->layerManager().getLayer(ResourceLayer::MENU)); 346 *screen->layerManager().getLayer(LAYERMENU));
347 if (!label.empty()) 347 if (!label.empty())
348 menu->setLabel(label); 348 menu->setLabel(label);
349 349
@@ -462,7 +462,7 @@ bool MenuCreator::createWindowMenuItem(const string &type,
462 return false; 462 return false;
463 463
464 RefMenu submenu( new AlphaMenu(screen->menuTheme(), screen->imageControl(), 464 RefMenu submenu( new AlphaMenu(screen->menuTheme(), screen->imageControl(),
465 *screen->layerManager().getLayer(ResourceLayer::MENU)) ); 465 *screen->layerManager().getLayer(LAYERMENU)) );
466 submenu->disableTitle(); 466 submenu->disableTitle();
467 menu.insert(label.empty() ? _FB_XTEXT(Configmenu, Transparency, "Transparency", 467 menu.insert(label.empty() ? _FB_XTEXT(Configmenu, Transparency, "Transparency",
468 "Menu containing various transparency options"): label, 468 "Menu containing various transparency options"): label,
@@ -488,7 +488,7 @@ bool MenuCreator::createWindowMenuItem(const string &type,
488 488
489 RefMenu submenu( new LayerMenu(screen->menuTheme(), 489 RefMenu submenu( new LayerMenu(screen->menuTheme(),
490 screen->imageControl(), 490 screen->imageControl(),
491 *screen->layerManager().getLayer(ResourceLayer::MENU), 491 *screen->layerManager().getLayer(LAYERMENU),
492 &context, 492 &context,
493 false) ); 493 false) );
494 submenu->disableTitle(); 494 submenu->disableTitle();