M src/Screen.cc → src/Screen.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: 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 @@ changeWorkspaceID(current_workspace->getWorkspaceID() - 1);
 
 		wkspc->removeAll();
 
-		workspacemenu->removeWorkspace(wkspc->getWorkspaceID());
+		workspacemenu->remove(wkspc->getWorkspaceID()+2); // + 2 is where workspaces starts
 		workspacemenu->update();
 		
 		//remove last workspace