back to basemenu insert/remove

1 files changed, 5 insertions, 4 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 4767363..1c86baf 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.32 2002/02/27 23:47:47 fluxgen Exp $
+// $Id: Screen.cc,v 1.33 2002/02/28 15:46:01 fluxgen Exp $
 
 // stupid macros needed to access some functions in version 2 of the GNU C
 // library
@@ -738,8 +738,9 @@ int BScreen::addWorkspace(void) {
         Workspace *wkspc = new Workspace(this, workspacesList.size());
         workspacesList.push_back(wkspc);
         //add workspace to workspacemenu
-        workspacemenu->addWorkspace(wkspc);
-        
+        workspacemenu->insert(wkspc->getName(), wkspc->getMenu(),
+                wkspc->getWorkspaceID() + 2); //+2 so we add it after "remove last"
+                
         workspacemenu->update();
         saveWorkspaces(workspacesList.size());
         toolbar->reconfigure();
@@ -761,7 +762,7 @@ int BScreen::removeLastWorkspace(void) {
 
                 wkspc->removeAll();
 
-                workspacemenu->removeWorkspace(wkspc->getWorkspaceID());
+                workspacemenu->remove(wkspc->getWorkspaceID()+2); // + 2 is where workspaces starts
                 workspacemenu->update();
                 
                 //remove last workspace