diff options
-rw-r--r-- | src/Screen.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 5cfdb81..092f23c 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.cc,v 1.79 2002/11/14 00:24:35 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.80 2002/11/15 12:15:39 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -344,12 +344,12 @@ resource(rm, screenname, altscreenname) | |||
344 | for (int i = 0; i < *resource.workspaces; ++i) { | 344 | for (int i = 0; i < *resource.workspaces; ++i) { |
345 | wkspc = new Workspace(this, workspacesList.size()); | 345 | wkspc = new Workspace(this, workspacesList.size()); |
346 | workspacesList.push_back(wkspc); | 346 | workspacesList.push_back(wkspc); |
347 | workspacemenu->insert(wkspc->name().c_str(), wkspc->menu()); | 347 | workspacemenu->insert(wkspc->name().c_str(), &wkspc->menu()); |
348 | } | 348 | } |
349 | } else { | 349 | } else { |
350 | wkspc = new Workspace(this, workspacesList.size()); | 350 | wkspc = new Workspace(this, workspacesList.size()); |
351 | workspacesList.push_back(wkspc); | 351 | workspacesList.push_back(wkspc); |
352 | workspacemenu->insert(wkspc->name().c_str(), wkspc->menu()); | 352 | workspacemenu->insert(wkspc->name().c_str(), &wkspc->menu()); |
353 | } | 353 | } |
354 | 354 | ||
355 | workspacemenu->insert(i18n-> | 355 | workspacemenu->insert(i18n-> |
@@ -686,7 +686,7 @@ int BScreen::addWorkspace() { | |||
686 | workspacesList.push_back(wkspc); | 686 | workspacesList.push_back(wkspc); |
687 | addWorkspaceName(wkspc->name().c_str()); // update names | 687 | addWorkspaceName(wkspc->name().c_str()); // update names |
688 | //add workspace to workspacemenu | 688 | //add workspace to workspacemenu |
689 | workspacemenu->insert(wkspc->name().c_str(), wkspc->menu(), | 689 | workspacemenu->insert(wkspc->name().c_str(), &wkspc->menu(), |
690 | wkspc->workspaceID() + 2); //+2 so we add it after "remove last" | 690 | wkspc->workspaceID() + 2); //+2 so we add it after "remove last" |
691 | 691 | ||
692 | workspacemenu->update(); | 692 | workspacemenu->update(); |
@@ -961,7 +961,7 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) { | |||
961 | Workspaces::iterator wit = workspacesList.begin(); | 961 | Workspaces::iterator wit = workspacesList.begin(); |
962 | Workspaces::iterator wit_end = workspacesList.end(); | 962 | Workspaces::iterator wit_end = workspacesList.end(); |
963 | for (; wit != wit_end; ++wit) { | 963 | for (; wit != wit_end; ++wit) { |
964 | session_stack[i++] = (*wit)->menu()->windowID(); | 964 | session_stack[i++] = (*wit)->menu().windowID(); |
965 | } | 965 | } |
966 | 966 | ||
967 | session_stack[i++] = workspacemenu->windowID(); | 967 | session_stack[i++] = workspacemenu->windowID(); |