Merge branch 'master' into to_push

1 files changed, 8 insertions, 8 deletions

diff --git a/src/MenuCreator.hh b/src/MenuCreator.hh
index c5d85ad..a9fb649 100644
--- a/src/MenuCreator.hh
+++ b/src/MenuCreator.hh
@@ -28,21 +28,21 @@
 #include <list>
 
 namespace FbTk {
+class AutoReloadHelper;
 class Menu;
 }
 
+class FbMenu;
 class FluxboxWindow;
 
 class MenuCreator {
 public:
-    static FbTk::Menu *createMenu(const std::string &label, int screen_num);
-    static FbTk::Menu *createFromFile(const std::string &filename, int screen_num, 
-                                      bool require_begin);
-    static FbTk::Menu *createMenuType(const std::string &label, int screen_num);
-    static bool createFromFile(const std::string &filename, FbTk::Menu &inject_into,
-                               bool require_begin);
-    static bool createWindowMenuFromFile(const std::string &filename, FbTk::Menu &inject_into, 
-                                         bool require_begin);
+    static FbMenu *createMenu(const std::string &label, int screen_num);
+    static FbMenu *createMenuType(const std::string &label, int screen_num);
+    static bool createFromFile(const std::string &filename,
+                               FbTk::Menu &inject_into,
+                               FbTk::AutoReloadHelper *reloader = NULL,
+                               bool begin = true);
     static bool createWindowMenuItem(const std::string &type, const std::string &label, 
                                      FbTk::Menu &inject_into);