4 files changed, 11 insertions, 9 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index c1bb3db..1182dba 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.177 2003/05/24 05:49:31 rathnor Exp $
+// $Id: Screen.cc,v 1.178 2003/05/24 13:13:22 rathnor Exp $
 
 
 #include "Screen.hh"
@@ -520,7 +520,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     resource(rm, screenname, altscreenname),
     m_toolbarhandler(0) {
 
-
     Display *disp = FbTk::App::instance()->display();
 
     initXinerama();
@@ -626,6 +625,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     }
 
     workspacemenu.reset(createMenuFromScreen(*this));
+    workspacemenu->setInternalMenu();
 
     if (*resource.workspaces != 0) {
         for (int i = 0; i < *resource.workspaces; ++i) {
diff --git a/src/Slit.cc b/src/Slit.cc
index 8830cb8..79ebb62 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Slit.cc,v 1.57 2003/05/19 15:32:47 rathnor Exp $
+// $Id: Slit.cc,v 1.58 2003/05/24 13:13:22 rathnor Exp $
 
 #include "Slit.hh"
 
@@ -1253,7 +1253,8 @@ void Slit::setupMenu() {
                                              SlitSet, SlitSlitPlacement,
                                              "Slit Placement"));
     m_placement_menu.setMinimumSublevels(3);
-    m_placement_menu.setInternalMenu();
+    m_layermenu->setInternalMenu();
+    m_clientlist_menu.setInternalMenu();
    
 
     // setup items in sub menu
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index e5b5a5a..4c954c4 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.87 2003/05/24 05:49:31 rathnor Exp $
+// $Id: Toolbar.cc,v 1.88 2003/05/24 13:13:22 rathnor Exp $
 
 #include "Toolbar.hh"
 
@@ -132,8 +132,6 @@ void setupMenus(Toolbar &tbar) {
                                  tbar.screen().doToolbarAutoHide(),
                                  reconfig_toolbar_and_save_resource));
 
-    menu.setInternalMenu();
-
     menu.insert("Layer...", &tbar.layermenu());
 
     if (tbar.screen().hasXinerama()) {
@@ -286,6 +284,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
     // we need to get notified when the theme is reloaded
     m_theme.addListener(m_themelistener);
 
+    m_layermenu.setInternalMenu();
+    m_placementmenu.setInternalMenu();
     setupMenus(*this);
 
     // geometry settings
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index a60a050..eda54c9 100644
--- a/src/ToolbarHandler.cc
+++ b/src/ToolbarHandler.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarHandler.cc,v 1.13 2003/05/15 23:30:05 fluxgen Exp $
+// $Id: ToolbarHandler.cc,v 1.14 2003/05/24 13:13:22 rathnor Exp $
 
 /**
  * The ToolbarHandler class acts as a rough interface to the toolbar.
@@ -96,6 +96,7 @@ ToolbarHandler::ToolbarHandler(BScreen &screen, ToolbarMode mode)
                  screen.screenNumber(), screen.imageControl())
 {
     m_modemenu.setInternalMenu();
+    m_toolbarmenu.setInternalMenu();
     setupModeMenu(m_modemenu, *this);
     setMode(mode, false); // the atomhandler part will initialise it shortly
 }
@@ -116,9 +117,9 @@ void ToolbarHandler::setMode(ToolbarMode mode, bool initialise) {
         return;
     } else if (!m_toolbar.get()) {
         m_toolbarmenu.removeAll();
-
         m_toolbar.reset(new Toolbar(m_screen, 
                                     *m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu));
+        
         m_toolbarmenu.insert("Mode...", &m_modemenu);   
         m_toolbarmenu.update();
     }