aboutsummaryrefslogtreecommitdiff
path: root/src/MenuCreator.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-02 08:19:48 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:11:29 (GMT)
commit82883442e7a9faf234d0a26ebc373bc4026118a1 (patch)
treeac3f64bfa05bf9febe5addf89ea1cc99906afb21 /src/MenuCreator.hh
parentdee1ec29d0db48b8a721e8152a980f1379e332af (diff)
downloadfluxbox_paul-82883442e7a9faf234d0a26ebc373bc4026118a1.zip
fluxbox_paul-82883442e7a9faf234d0a26ebc373bc4026118a1.tar.bz2
CustomMenu command now shows lua menus
Diffstat (limited to 'src/MenuCreator.hh')
-rw-r--r--src/MenuCreator.hh8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/MenuCreator.hh b/src/MenuCreator.hh
index 0d13529..60f931d 100644
--- a/src/MenuCreator.hh
+++ b/src/MenuCreator.hh
@@ -42,14 +42,12 @@ class FluxboxWindow;
42 42
43namespace MenuCreator { 43namespace MenuCreator {
44 void 44 void
45 createMenu(FbMenu &inject_into, lua::state &l, int screen_number, 45 createMenu(FbTk::Menu &inject_into, lua::state &l, FbTk::AutoReloadHelper *reloader = NULL);
46 FbTk::AutoReloadHelper *reloader = NULL);
47 FbMenu *createMenu(const std::string &label, int screen_num); 46 FbMenu *createMenu(const std::string &label, int screen_num);
48 FbMenu *createMenuType(const std::string &label, int screen_num); 47 FbMenu *createMenuType(const std::string &label, int screen_num);
49 bool createFromFile(const std::string &filename, 48 void createFromFile(const std::string &filename,
50 FbTk::Menu &inject_into, 49 FbTk::Menu &inject_into,
51 FbTk::AutoReloadHelper *reloader = NULL, 50 FbTk::AutoReloadHelper *reloader = NULL);
52 bool begin = true);
53 bool createWindowMenuItem(const std::string &type, const std::string &label, 51 bool createWindowMenuItem(const std::string &type, const std::string &label,
54 FbTk::Menu &inject_into); 52 FbTk::Menu &inject_into);
55} 53}