aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 7b6f0b8..e63a121 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.201 2003/10/28 02:17:03 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.202 2003/12/03 00:30:22 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -68,7 +68,8 @@
68#endif // REMEMBER 68#endif // REMEMBER
69#ifdef USE_TOOLBAR 69#ifdef USE_TOOLBAR
70#include "Toolbar.hh" 70#include "Toolbar.hh"
71#include "ToolbarHandler.hh" 71#else
72class Toolbar { };
72#endif // USE_TOOLBAR 73#endif // USE_TOOLBAR
73 74
74// X headers 75// X headers
@@ -552,7 +553,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
552 553
553 m_screen_list.push_back(screen); 554 m_screen_list.push_back(screen);
554#ifdef USE_TOOLBAR 555#ifdef USE_TOOLBAR
555 m_atomhandler.push_back(new ToolbarHandler(*screen)); 556 m_toolbars.push_back(new Toolbar(*screen,
557 *screen->layerManager().getLayer(Fluxbox::instance()->getNormalLayer())));
556#endif // USE_TOOLBAR 558#endif // USE_TOOLBAR
557 559
558 // attach screen signals to this 560 // attach screen signals to this
@@ -565,9 +567,12 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
565 for (size_t atomh=0; atomh<m_atomhandler.size(); ++atomh) { 567 for (size_t atomh=0; atomh<m_atomhandler.size(); ++atomh) {
566 m_atomhandler[atomh]->initForScreen(*screen); 568 m_atomhandler[atomh]->initForScreen(*screen);
567 } 569 }
570
568 revertFocus(*screen, false); // make sure focus style is correct 571 revertFocus(*screen, false); // make sure focus style is correct
569 572
570 } 573 } // end init screens
574
575
571 m_keyscreen = m_mousescreen = m_screen_list.front(); 576 m_keyscreen = m_mousescreen = m_screen_list.front();
572 577
573 if (m_screen_list.size() == 0) { 578 if (m_screen_list.size() == 0) {
@@ -605,12 +610,19 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
605 610
606 611
607Fluxbox::~Fluxbox() { 612Fluxbox::~Fluxbox() {
613 // destroy toolbars
614 while (!m_toolbars.empty()) {
615 delete m_toolbars.back();
616 m_toolbars.pop_back();
617 }
618
608 // destroy atomhandlers 619 // destroy atomhandlers
609 while (!m_atomhandler.empty()) { 620 while (!m_atomhandler.empty()) {
610 delete m_atomhandler.back(); 621 delete m_atomhandler.back();
611 m_atomhandler.pop_back(); 622 m_atomhandler.pop_back();
612 } 623 }
613 624
625
614 clearMenuFilenames(); 626 clearMenuFilenames();
615} 627}
616 628