nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pointer/referens fixes

Browse source
This commit is contained in:
fluxgen 2002-11-15 12:15:39 +00:00
parent 530a55a1e4
commit adb2f2aed6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.79 2002/11/14 00:24:35 fluxgen Exp $ // $Id: Screen.cc,v 1.80 2002/11/15 12:15:39 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -344,12 +344,12 @@ resource(rm, screenname, altscreenname)
for (int i = 0; i < *resource.workspaces; ++i) { for (int i = 0; i < *resource.workspaces; ++i) {
wkspc = new Workspace(this, workspacesList.size()); wkspc = new Workspace(this, workspacesList.size());
workspacesList.push_back(wkspc); workspacesList.push_back(wkspc);
workspacemenu->insert(wkspc->name().c_str(), wkspc->menu()); workspacemenu->insert(wkspc->name().c_str(), &wkspc->menu());
} }
} else { } else {
wkspc = new Workspace(this, workspacesList.size()); wkspc = new Workspace(this, workspacesList.size());
workspacesList.push_back(wkspc); workspacesList.push_back(wkspc);
workspacemenu->insert(wkspc->name().c_str(), wkspc->menu()); workspacemenu->insert(wkspc->name().c_str(), &wkspc->menu());
} }
workspacemenu->insert(i18n-> workspacemenu->insert(i18n->
@ -686,7 +686,7 @@ int BScreen::addWorkspace() {
workspacesList.push_back(wkspc); workspacesList.push_back(wkspc);
addWorkspaceName(wkspc->name().c_str()); // update names addWorkspaceName(wkspc->name().c_str()); // update names
//add workspace to workspacemenu //add workspace to workspacemenu
workspacemenu->insert(wkspc->name().c_str(), wkspc->menu(), workspacemenu->insert(wkspc->name().c_str(), &wkspc->menu(),
wkspc->workspaceID() + 2); //+2 so we add it after "remove last" wkspc->workspaceID() + 2); //+2 so we add it after "remove last"
workspacemenu->update(); workspacemenu->update();
@ -961,7 +961,7 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) {
Workspaces::iterator wit = workspacesList.begin(); Workspaces::iterator wit = workspacesList.begin();
Workspaces::iterator wit_end = workspacesList.end(); Workspaces::iterator wit_end = workspacesList.end();
for (; wit != wit_end; ++wit) { for (; wit != wit_end; ++wit) {
session_stack[i++] = (*wit)->menu()->windowID(); session_stack[i++] = (*wit)->menu().windowID();
} }
session_stack[i++] = workspacemenu->windowID(); session_stack[i++] = workspacemenu->windowID();