diff options
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index 0436769..d8f886b 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -44,7 +44,6 @@ | |||
44 | #include "MacroCommand.hh" | 44 | #include "MacroCommand.hh" |
45 | #include "FbCommands.hh" | 45 | #include "FbCommands.hh" |
46 | #include "LayerMenu.hh" | 46 | #include "LayerMenu.hh" |
47 | #include "fluxbox.hh" | ||
48 | #include "XLayer.hh" | 47 | #include "XLayer.hh" |
49 | #include "RootTheme.hh" | 48 | #include "RootTheme.hh" |
50 | #include "FbTk/Theme.hh" | 49 | #include "FbTk/Theme.hh" |
@@ -252,13 +251,13 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) | |||
252 | m_screen(scr), | 251 | m_screen(scr), |
253 | m_slitmenu(scr.menuTheme(), | 252 | m_slitmenu(scr.menuTheme(), |
254 | scr.imageControl(), | 253 | scr.imageControl(), |
255 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | 254 | *scr.layerManager().getLayer(Layer::MENU)), |
256 | m_placement_menu(scr.menuTheme(), | 255 | m_placement_menu(scr.menuTheme(), |
257 | scr.imageControl(), | 256 | scr.imageControl(), |
258 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | 257 | *scr.layerManager().getLayer(Layer::MENU)), |
259 | m_clientlist_menu(scr.menuTheme(), | 258 | m_clientlist_menu(scr.menuTheme(), |
260 | scr.imageControl(), | 259 | scr.imageControl(), |
261 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | 260 | *scr.layerManager().getLayer(Layer::MENU)), |
262 | frame(scr.rootWindow()), | 261 | frame(scr.rootWindow()), |
263 | //For KDE dock applets | 262 | //For KDE dock applets |
264 | m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), | 263 | m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), |
@@ -284,7 +283,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) | |||
284 | scr.name() + ".slit.alpha", scr.altName() + ".Slit.Alpha"), | 283 | scr.name() + ".slit.alpha", scr.altName() + ".Slit.Alpha"), |
285 | m_rc_on_head(scr.resourceManager(), 0, | 284 | m_rc_on_head(scr.resourceManager(), 0, |
286 | scr.name() + ".slit.onhead", scr.altName() + ".Slit.onHead"), | 285 | scr.name() + ".slit.onhead", scr.altName() + ".Slit.onHead"), |
287 | m_rc_layernum(scr.resourceManager(), Fluxbox::Layer(Fluxbox::instance()->getDockLayer()), | 286 | m_rc_layernum(scr.resourceManager(), Layer(Layer::DOCK), |
288 | scr.name() + ".slit.layer", scr.altName() + ".Slit.Layer") { | 287 | scr.name() + ".slit.layer", scr.altName() + ".Slit.Layer") { |
289 | 288 | ||
290 | _FB_USES_NLS; | 289 | _FB_USES_NLS; |
@@ -317,7 +316,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) | |||
317 | m_layermenu.reset(new LayerMenu(scr.menuTheme(), | 316 | m_layermenu.reset(new LayerMenu(scr.menuTheme(), |
318 | scr.imageControl(), | 317 | scr.imageControl(), |
319 | *scr.layerManager(). | 318 | *scr.layerManager(). |
320 | getLayer(Fluxbox::instance()->getMenuLayer()), | 319 | getLayer(Layer::MENU), |
321 | this, | 320 | this, |
322 | true)); | 321 | true)); |
323 | m_layermenu->setLabel(_FBTEXT(Slit, Layer, "Slit Layer", "Title of Slit Layer Menu")); | 322 | m_layermenu->setLabel(_FBTEXT(Slit, Layer, "Slit Layer", "Title of Slit Layer Menu")); |
@@ -1240,7 +1239,7 @@ void Slit::setupMenu() { | |||
1240 | screen().menuTheme(), | 1239 | screen().menuTheme(), |
1241 | screen(), | 1240 | screen(), |
1242 | screen().imageControl(), | 1241 | screen().imageControl(), |
1243 | *screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | 1242 | *screen().layerManager().getLayer(Layer::MENU), |
1244 | *this, | 1243 | *this, |
1245 | _FBTEXT(Slit, OnHead, "Slit on Head", "Title of Slits On Head menu") | 1244 | _FBTEXT(Slit, OnHead, "Slit on Head", "Title of Slits On Head menu") |
1246 | )); | 1245 | )); |