lots and lots of code cleanup, plus introduced new ClientMenu class

1 files changed, 3 insertions, 4 deletions

diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 5264a4d..e24693e 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -30,8 +30,7 @@
 #include "Window.hh"
 #include "WindowCmd.hh"
 
-#include "FbMenu.hh"
-#include "IconMenu.hh"
+#include "ClientMenu.hh"
 #include "WorkspaceMenu.hh"
 #include "LayerMenu.hh"
 #include "SendToMenu.hh"
@@ -51,7 +50,6 @@
 #include "FbTk/StringUtil.hh"
 #include "FbTk/FileUtil.hh"
 #include "FbTk/MenuSeparator.hh"
-#include "FbTk/MenuIcon.hh"
 #include "FbTk/Transparent.hh"
 
 #include <iostream>
@@ -511,7 +509,8 @@ FbTk::Menu *MenuCreator::createMenuType(const string &type, int screen_num) {
     if (screen == 0)
         return 0;
     if (type == "iconmenu") {
-        return new IconMenu(*screen);
+        return new ClientMenu(*screen, screen->iconList(),
+                              &screen->iconListSig());
     } else if (type == "workspacemenu") {
         return new WorkspaceMenu(*screen);
     } else if (type == "windowmenu") {