aboutsummaryrefslogtreecommitdiff
path: root/src/FbCommands.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2005-07-04 18:19:53 (GMT)
committerfluxgen <fluxgen>2005-07-04 18:19:53 (GMT)
commit63475f77965c0dce84a4130b90573aeb9c0a3692 (patch)
tree8ccb9460afb78bcbc68759d88471e091447eddba /src/FbCommands.cc
parent3626faea73a7e033e14ec2d06bdcb2b180d06172 (diff)
downloadfluxbox-63475f77965c0dce84a4130b90573aeb9c0a3692.zip
fluxbox-63475f77965c0dce84a4130b90573aeb9c0a3692.tar.bz2
cleaning, change getCount to numberOfWorkspaces
Diffstat (limited to 'src/FbCommands.cc')
-rw-r--r--src/FbCommands.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index fc3f321..cdecc2b 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -61,7 +61,7 @@ namespace {
61void showMenu(const BScreen &screen, FbTk::Menu &menu) { 61void showMenu(const BScreen &screen, FbTk::Menu &menu) {
62 62
63 // special case for root menu 63 // special case for root menu
64 if (&menu == &screen.getRootmenu()) { 64 if (&menu == &screen.rootMenu()) {
65 Fluxbox* fb = Fluxbox::instance(); 65 Fluxbox* fb = Fluxbox::instance();
66 if(fb->menuTimestampsChanged()) { 66 if(fb->menuTimestampsChanged()) {
67 // we dont show the menu here because fluxbox 67 // we dont show the menu here because fluxbox
@@ -221,7 +221,7 @@ void ShowRootMenuCmd::execute() {
221 if (screen == 0) 221 if (screen == 0)
222 return; 222 return;
223 223
224 ::showMenu(*screen, screen->getRootmenu()); 224 ::showMenu(*screen, screen->rootMenu());
225} 225}
226 226
227void ShowWorkspaceMenuCmd::execute() { 227void ShowWorkspaceMenuCmd::execute() {
@@ -229,7 +229,7 @@ void ShowWorkspaceMenuCmd::execute() {
229 if (screen == 0) 229 if (screen == 0)
230 return; 230 return;
231 231
232 ::showMenu(*screen, screen->getWorkspacemenu()); 232 ::showMenu(*screen, screen->workspaceMenu());
233} 233}
234 234
235 235
@@ -324,8 +324,8 @@ void DeiconifyCmd::execute() {
324 if (screen == 0) 324 if (screen == 0)
325 return; 325 return;
326 326
327 BScreen::Icons::reverse_iterator it= screen->getIconList().rbegin(); 327 BScreen::Icons::reverse_iterator it= screen->iconList().rbegin();
328 BScreen::Icons::reverse_iterator itend= screen->getIconList().rend(); 328 BScreen::Icons::reverse_iterator itend= screen->iconList().rend();
329 unsigned int workspace_num= screen->currentWorkspaceID(); 329 unsigned int workspace_num= screen->currentWorkspaceID();
330 unsigned int old_workspace_num; 330 unsigned int old_workspace_num;
331 331