aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarHandler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/ToolbarHandler.cc')
-rw-r--r--src/ToolbarHandler.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index f723818..1bc13c1 100644
--- a/src/ToolbarHandler.cc
+++ b/src/ToolbarHandler.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ToolbarHandler.cc,v 1.10 2003/05/11 17:11:58 fluxgen Exp $ 23// $Id: ToolbarHandler.cc,v 1.11 2003/05/15 11:17:27 fluxgen Exp $
24 24
25/** 25/**
26 * The ToolbarHandler class acts as a rough interface to the toolbar. 26 * The ToolbarHandler class acts as a rough interface to the toolbar.
@@ -196,7 +196,7 @@ void ToolbarHandler::initForScreen(BScreen &screen) {
196 BScreen::Icons::iterator iconit = wiconlist.begin(); 196 BScreen::Icons::iterator iconit = wiconlist.begin();
197 BScreen::Icons::iterator iconit_end = wiconlist.end(); 197 BScreen::Icons::iterator iconit_end = wiconlist.end();
198 for(; iconit != iconit_end; ++iconit) { 198 for(; iconit != iconit_end; ++iconit) {
199 if ((*iconit)->getWorkspaceNumber() == m_current_workspace) 199 if ((*iconit)->workspaceNumber() == m_current_workspace)
200 m_toolbar->addIcon(*iconit); 200 m_toolbar->addIcon(*iconit);
201 } 201 }
202 } 202 }
@@ -213,11 +213,11 @@ void ToolbarHandler::setupWindow(FluxboxWindow &win) {
213 case NONE: 213 case NONE:
214 break; 214 break;
215 case WORKSPACE: 215 case WORKSPACE:
216 if (win.getWorkspaceNumber() == m_current_workspace) 216 if (win.workspaceNumber() == m_current_workspace)
217 m_toolbar->addIcon(&win); 217 m_toolbar->addIcon(&win);
218 break; 218 break;
219 case WORKSPACEICONS: 219 case WORKSPACEICONS:
220 if (win.getWorkspaceNumber() != m_current_workspace) 220 if (win.workspaceNumber() != m_current_workspace)
221 break; 221 break;
222 // else fall through and add the icon 222 // else fall through and add the icon
223 case LASTMODE: 223 case LASTMODE:
@@ -242,7 +242,7 @@ void ToolbarHandler::updateWindowClose(FluxboxWindow &win) {
242 case NONE: 242 case NONE:
243 break; 243 break;
244 case WORKSPACEICONS: 244 case WORKSPACEICONS:
245 if (win.getWorkspaceNumber() != m_current_workspace) 245 if (win.workspaceNumber() != m_current_workspace)
246 break; 246 break;
247 // else fall through and remove the icon 247 // else fall through and remove the icon
248 case LASTMODE: 248 case LASTMODE:
@@ -252,7 +252,7 @@ void ToolbarHandler::updateWindowClose(FluxboxWindow &win) {
252 } 252 }
253 break; 253 break;
254 case WORKSPACE: 254 case WORKSPACE:
255 if (win.getWorkspaceNumber() == m_current_workspace) 255 if (win.workspaceNumber() == m_current_workspace)
256 m_toolbar->delIcon(&win); 256 m_toolbar->delIcon(&win);
257 break; 257 break;
258 case ALLWINDOWS: 258 case ALLWINDOWS:
@@ -273,7 +273,7 @@ void ToolbarHandler::updateState(FluxboxWindow &win) {
273 case ALLWINDOWS: 273 case ALLWINDOWS:
274 break; 274 break;
275 case WORKSPACEICONS: 275 case WORKSPACEICONS:
276 if (win.getWorkspaceNumber() != m_current_workspace) break; 276 if (win.workspaceNumber() != m_current_workspace) break;
277 // else fall through and do the same as icons (knowing it is the right ws) 277 // else fall through and do the same as icons (knowing it is the right ws)
278 case LASTMODE: 278 case LASTMODE:
279 case ICONS: 279 case ICONS:
@@ -298,7 +298,7 @@ void ToolbarHandler::updateWorkspace(FluxboxWindow &win) {
298 // don't care about current workspace except if in workspace mode 298 // don't care about current workspace except if in workspace mode
299 if (!(m_mode == WORKSPACE || (m_mode == WORKSPACEICONS && win.isIconic()))) return; 299 if (!(m_mode == WORKSPACE || (m_mode == WORKSPACEICONS && win.isIconic()))) return;
300 300
301 if (win.getWorkspaceNumber() == m_current_workspace) { 301 if (win.workspaceNumber() == m_current_workspace) {
302 //!! TODO 302 //!! TODO
303 // this shouldn't be needed, but is until Workspaces get fixed so that 303 // this shouldn't be needed, but is until Workspaces get fixed so that
304 // you only move between them, you don't 'add' and 'remove' 304 // you only move between them, you don't 'add' and 'remove'