M src/Slit.cc → src/Slit.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Slit.cc,v 1.95 2004/06/07 11:46:04 rathnor Exp $
+// $Id: Slit.cc,v 1.96 2004/06/07 21:36:06 fluxgen Exp $
 
 #include "Slit.hh"
 
@@ -247,12 +247,7 @@ *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
       m_clientlist_menu(scr.menuTheme(),
                         scr.imageControl(),
                         *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
-      m_layermenu(new LayerMenu<Slit>(scr.menuTheme(),
-                                      scr.imageControl(),
-                                      *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 
-                                      this,
-                                      true)),
-      //For KDE dock applets
+       //For KDE dock applets
       m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), 
                                     "KWM_DOCKWINDOW", False)), //KDE v1.x
       m_kwm2_dockwindow(XInternAtom(FbTk::App::instance()->display(), 
@@ -316,6 +311,12 @@ FbTk::EventManager::instance()->add(*this, frame.window);
     
     frame.window.setAlpha(*m_rc_alpha);
     m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer));
+    m_layermenu.reset(new LayerMenu<Slit>(scr.menuTheme(),
+                                    scr.imageControl(),
+                                    *scr.layerManager().
+                                    getLayer(Fluxbox::instance()->getMenuLayer()), 
+                                          this,
+                                          true));
     moveToLayer((*m_rc_layernum).getNum());
 
     if (m_layermenu.get())

M src/Toolbar.cc → src/Toolbar.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.140 2004/06/07 11:46:04 rathnor Exp $
+// $Id: Toolbar.cc,v 1.141 2004/06/07 21:32:12 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -191,6 +191,7 @@ m_hidden(false),
     frame(*this, scrn.screenNumber()),
     m_window_pm(0),
     m_screen(scrn),
+    m_layeritem(frame.window, layer),
     m_layermenu(scrn.menuTheme(), 
                 scrn.imageControl(),
                 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 
@@ -203,7 +204,6 @@ m_toolbarmenu(scrn.menuTheme(),
                   scrn.imageControl(),
                   *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
     m_theme(scrn.screenNumber()),
-    m_layeritem(frame.window, layer),
     m_tool_factory(scrn),
     m_strut(0),
     // lock rcmanager here

M src/Toolbar.hh → src/Toolbar.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.hh,v 1.52 2003/12/20 19:04:45 fluxgen Exp $
+// $Id: Toolbar.hh,v 1.53 2004/06/07 21:32:11 fluxgen Exp $
 
 #ifndef	 TOOLBAR_HH
 #define	 TOOLBAR_HH
@@ -160,6 +160,7 @@ BScreen &m_screen; ///< screen connection
 
     FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar
 
+    FbTk::XLayerItem m_layeritem; ///< layer item, must be declared before layermenu
     LayerMenu<Toolbar> m_layermenu;
     FbMenu  m_placementmenu, m_toolbarmenu;
 
@@ -167,7 +168,7 @@ 
     // themes
     ToolbarTheme m_theme;
     
-    FbTk::XLayerItem m_layeritem;
+
     typedef std::list<ToolbarItem *> ItemList;
     ItemList m_item_list;