Refactor: move some menu-creation functions to MenuCreator

Another patch to trim down the code that needs to be part of BScreen

1 files changed, 1 insertions, 20 deletions

diff --git a/src/Screen.hh b/src/Screen.hh
index dcdcb06..eb2a306 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -43,13 +43,7 @@
 
 #include "FocusControl.hh"
 
-#include <X11/Xresource.h>
-
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
+#include <cstdio>
 #include <list>
 #include <vector>
 #include <fstream>
@@ -234,19 +228,6 @@ public:
     bool isCycling() const { return m_cycling; }
 
     /**
-     * Creates an empty menu with specified label
-     * @param label for the menu
-     * @return created menu
-     */
-    FbMenu *createMenu(const std::string &label);
-    /**
-     * Creates an empty toggle menu with a specific label
-     * @param label
-     * @return created menu
-     */
-    FbMenu *createToggleMenu(const std::string &label);
-
-    /**
      * For extras to add menus.
      * These menus will be marked internal,
      * and deleted when the window dies (as opposed to Screen