aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index b2e57ed..0d1923b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -84,13 +84,13 @@
84#include "config.h" 84#include "config.h"
85#endif // HAVE_CONFIG_H 85#endif // HAVE_CONFIG_H
86 86
87#ifdef SLIT 87#ifdef USE_SLIT
88#include "Slit.hh" 88#include "Slit.hh"
89#include "SlitClient.hh" 89#include "SlitClient.hh"
90#else 90#else
91// fill it in 91// fill it in
92class Slit {}; 92class Slit {};
93#endif // SLIT 93#endif // USE_SLIT
94 94
95#ifdef USE_TOOLBAR 95#ifdef USE_TOOLBAR
96#include "Toolbar.hh" 96#include "Toolbar.hh"
@@ -478,10 +478,10 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
478 478
479 changeWorkspaceID(first_desktop); 479 changeWorkspaceID(first_desktop);
480 480
481#ifdef SLIT 481#ifdef USE_SLIT
482 m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP), 482 m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP),
483 fluxbox->getSlitlistFilename().c_str())); 483 fluxbox->getSlitlistFilename().c_str()));
484#endif // SLIT 484#endif // USE_SLIT
485 485
486 rm.unlock(); 486 rm.unlock();
487 487
@@ -682,10 +682,10 @@ void BScreen::initWindows() {
682 XFree(children); 682 XFree(children);
683 683
684 // now, show slit and toolbar 684 // now, show slit and toolbar
685#ifdef SLIT 685#ifdef USE_SLIT
686 if (slit()) 686 if (slit())
687 slit()->show(); 687 slit()->show();
688#endif // SLIT 688#endif // USE_SLIT
689 689
690} 690}
691 691
@@ -1209,11 +1209,11 @@ bool BScreen::addKdeDockapp(Window client) {
1209 handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber())); 1209 handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber()));
1210#endif 1210#endif
1211 if (handler == 0) { 1211 if (handler == 0) {
1212#ifdef SLIT 1212#ifdef USE_SLIT
1213 if (slit() != 0 && slit()->acceptKdeDockapp()) 1213 if (slit() != 0 && slit()->acceptKdeDockapp())
1214 slit()->addClient(client); 1214 slit()->addClient(client);
1215 else 1215 else
1216#endif // SLIT 1216#endif // USE_SLIT
1217 return false; 1217 return false;
1218 } else { 1218 } else {
1219 // this handler is a special case 1219 // this handler is a special case
@@ -1242,10 +1242,10 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1242 1242
1243 if (winclient->initial_state == WithdrawnState) { 1243 if (winclient->initial_state == WithdrawnState) {
1244 delete winclient; 1244 delete winclient;
1245#ifdef SLIT 1245#ifdef USE_SLIT
1246 if (slit() && !isKdeDockapp(client)) 1246 if (slit() && !isKdeDockapp(client))
1247 slit()->addClient(client); 1247 slit()->addClient(client);
1248#endif // SLIT 1248#endif // USE_SLIT
1249 return 0; 1249 return 0;
1250 } 1250 }
1251 1251