must initialize toolbar before the windows

This commit is contained in:
Henrik Kinnunen 2008-01-15 10:56:25 +01:00
parent f6c292a406
commit 8c2cee577a

View file

@ -629,6 +629,12 @@ bool BScreen::isRestart() {
} }
void BScreen::initWindows() { void BScreen::initWindows() {
#ifdef USE_TOOLBAR
m_toolbar.reset(new Toolbar(*this,
*layerManager().getLayer(::Layer::NORMAL)));
#endif // USE_TOOLBAR
unsigned int nchild; unsigned int nchild;
Window r, p, *children; Window r, p, *children;
Display *disp = FbTk::App::instance()->display(); Display *disp = FbTk::App::instance()->display();
@ -726,11 +732,6 @@ void BScreen::initWindows() {
slit()->show(); slit()->show();
#endif // SLIT #endif // SLIT
#ifdef USE_TOOLBAR
m_toolbar.reset(new Toolbar(*this,
*layerManager().getLayer(::Layer::NORMAL)));
#endif // USE_TOOLBAR
} }
unsigned int BScreen::currentWorkspaceID() const { unsigned int BScreen::currentWorkspaceID() const {