aboutsummaryrefslogtreecommitdiff
path: root/src/MenuCreator.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/MenuCreator.cc
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/MenuCreator.cc')
-rw-r--r--src/MenuCreator.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index fefb3dc..a99d785 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -31,8 +31,7 @@
31#include "Window.hh" 31#include "Window.hh"
32#include "WindowCmd.hh" 32#include "WindowCmd.hh"
33 33
34#include "FbMenu.hh" 34#include "ClientMenu.hh"
35#include "IconMenu.hh"
36#include "WorkspaceMenu.hh" 35#include "WorkspaceMenu.hh"
37#include "LayerMenu.hh" 36#include "LayerMenu.hh"
38#include "SendToMenu.hh" 37#include "SendToMenu.hh"
@@ -52,7 +51,6 @@
52#include "FbTk/StringUtil.hh" 51#include "FbTk/StringUtil.hh"
53#include "FbTk/FileUtil.hh" 52#include "FbTk/FileUtil.hh"
54#include "FbTk/MenuSeparator.hh" 53#include "FbTk/MenuSeparator.hh"
55#include "FbTk/MenuIcon.hh"
56#include "FbTk/Transparent.hh" 54#include "FbTk/Transparent.hh"
57 55
58#include <iostream> 56#include <iostream>
@@ -470,8 +468,8 @@ FbTk::Menu *MenuCreator::createFromFile(const string &filename, int screen_numbe
470 468
471bool MenuCreator::createFromFile(const string &filename, 469bool MenuCreator::createFromFile(const string &filename,
472 FbTk::Menu &inject_into, bool require_begin) { 470 FbTk::Menu &inject_into, bool require_begin) {
473
474 string real_filename = FbTk::StringUtil::expandFilename(filename); 471 string real_filename = FbTk::StringUtil::expandFilename(filename);
472
475 FbMenuParser parser(real_filename); 473 FbMenuParser parser(real_filename);
476 if (!parser.isLoaded()) 474 if (!parser.isLoaded())
477 return false; 475 return false;
@@ -521,7 +519,8 @@ FbTk::Menu *MenuCreator::createMenuType(const string &type, int screen_num) {
521 if (screen == 0) 519 if (screen == 0)
522 return 0; 520 return 0;
523 if (type == "iconmenu") { 521 if (type == "iconmenu") {
524 return new IconMenu(*screen); 522 return new ClientMenu(*screen, screen->iconList(),
523 &screen->iconListSig());
525 } else if (type == "workspacemenu") { 524 } else if (type == "workspacemenu") {
526 return new WorkspaceMenu(*screen); 525 return new WorkspaceMenu(*screen);
527 } else if (type == "windowmenu") { 526 } else if (type == "windowmenu") {