1 files changed, 9 insertions, 11 deletions

diff --git a/src/LayerMenu.cc b/src/LayerMenu.cc
index afcd4ac..cec0c59 100644
--- a/src/LayerMenu.cc
+++ b/src/LayerMenu.cc
@@ -1,6 +1,7 @@
 #include "LayerMenu.hh"
 
-#include "fluxbox.hh"
+#include "FbCommands.hh"
+#include "Layer.hh"
 
 #include "FbTk/RefCount.hh"
 #include "FbTk/SimpleCommand.hh"
@@ -11,7 +12,6 @@ LayerMenu::LayerMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl,
     ToggleMenu(tm, imgctrl, layer) {
     _FB_USES_NLS;
 
-    Fluxbox *fluxbox = Fluxbox::instance();
     
     struct {
         int set;
@@ -20,17 +20,15 @@ LayerMenu::LayerMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl,
         int layernum;
     } layer_menuitems[]  = {
         //TODO: nls
-        {0, 0, _FBTEXT(Layer, AboveDock, "Above Dock", "Layer above dock"), fluxbox->getAboveDockLayer()},
-        {0, 0, _FBTEXT(Layer, Dock, "Dock", "Layer dock"), fluxbox->getDockLayer()},
-        {0, 0, _FBTEXT(Layer, Top, "Top", "Layer top"), fluxbox->getTopLayer()},
-        {0, 0, _FBTEXT(Layer, Normal, "Normal", "Layer normal"), fluxbox->getNormalLayer()},
-        {0, 0, _FBTEXT(Layer, Bottom, "Bottom", "Layer bottom"), fluxbox->getBottomLayer()},
-        {0, 0, _FBTEXT(Layer, Desktop, "Desktop", "Layer desktop"), fluxbox->getDesktopLayer()},
+        {0, 0, _FBTEXT(Layer, AboveDock, "Above Dock", "Layer above dock"), Layer::ABOVE_DOCK},
+        {0, 0, _FBTEXT(Layer, Dock, "Dock", "Layer dock"), Layer::DOCK},
+        {0, 0, _FBTEXT(Layer, Top, "Top", "Layer top"), Layer::TOP},
+        {0, 0, _FBTEXT(Layer, Normal, "Normal", "Layer normal"), Layer::NORMAL},
+        {0, 0, _FBTEXT(Layer, Bottom, "Bottom", "Layer bottom"), Layer::BOTTOM},
+        {0, 0, _FBTEXT(Layer, Desktop, "Desktop", "Layer desktop"), Layer::DESKTOP},
     };
     
-    FbTk::RefCount<FbTk::Command> saverc_cmd(new FbTk::SimpleCommand<Fluxbox>(
-                                             *Fluxbox::instance(), 
-                                             &Fluxbox::save_rc));
+    FbTk::RefCount<FbTk::Command> saverc_cmd(new FbCommands::SaveResources());
 
     for (size_t i=0; i < 6; ++i) {
         // TODO: fetch nls string