aboutsummaryrefslogtreecommitdiff
path: root/src/MenuCreator.hh
diff options
context:
space:
mode:
authorHenrik Kinnunen <fluxgen@fluxbox.org>2008-05-13 15:07:30 (GMT)
committerHenrik Kinnunen <fluxgen@fluxbox.org>2008-05-13 15:07:30 (GMT)
commit7f45bae4629f345906e96c1fcb3a3d1e49c36382 (patch)
treeb09708632d29ac4471c57446eb726e5401c8570f /src/MenuCreator.hh
parent5ecebae4770cbe7e4feea46d2c074a818f1c9662 (diff)
parentd7aa526d9275f7c94f0b1ce27464eaf3dae0d78d (diff)
downloadfluxbox_paul-7f45bae4629f345906e96c1fcb3a3d1e49c36382.zip
fluxbox_paul-7f45bae4629f345906e96c1fcb3a3d1e49c36382.tar.bz2
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Diffstat (limited to 'src/MenuCreator.hh')
-rw-r--r--src/MenuCreator.hh16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/MenuCreator.hh b/src/MenuCreator.hh
index 4494dc7..8fb0242 100644
--- a/src/MenuCreator.hh
+++ b/src/MenuCreator.hh
@@ -28,18 +28,24 @@
28#include <list> 28#include <list>
29 29
30namespace FbTk { 30namespace FbTk {
31class AutoReloadHelper;
31class Menu; 32class Menu;
32} 33}
33 34
35class FbMenu;
34class FluxboxWindow; 36class FluxboxWindow;
35 37
36class MenuCreator { 38class MenuCreator {
37public: 39public:
38 static FbTk::Menu *createMenu(const std::string &label, int screen_num); 40 static FbMenu *createMenu(const std::string &label, int screen_num);
39 static FbTk::Menu *createFromFile(const std::string &filename, int screen_num); 41 static FbMenu *createMenuType(const std::string &label, int screen_num);
40 static FbTk::Menu *createMenuType(const std::string &label, int screen_num); 42 static bool createFromFile(const std::string &filename,
41 static bool createFromFile(const std::string &filename, FbTk::Menu &inject_into); 43 FbTk::Menu &inject_into,
42 static bool createWindowMenuFromFile(const std::string &filename, FbTk::Menu &inject_into); 44 FbTk::AutoReloadHelper *reloader = NULL,
45 bool begin = true);
46 static void createWindowMenuFromFile(const std::string &filename,
47 FbTk::Menu &inject_into,
48 FbTk::AutoReloadHelper *reloader);
43 static bool createWindowMenuItem(const std::string &type, const std::string &label, 49 static bool createWindowMenuItem(const std::string &type, const std::string &label,
44 FbTk::Menu &inject_into); 50 FbTk::Menu &inject_into);
45 51