diff options
| author | Pavel Labath <pavelo@centrum.sk> | 2011-07-01 21:30:54 (GMT) |
|---|---|---|
| committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:11:29 (GMT) |
| commit | dee1ec29d0db48b8a721e8152a980f1379e332af (patch) | |
| tree | 0a4d73877d82b71220cae88e283a993e95193d28 /src/MenuCreator.hh | |
| parent | fb69fe4ffba1eaceab61ea68052f41589b479784 (diff) | |
| download | fluxbox_paul-dee1ec29d0db48b8a721e8152a980f1379e332af.zip fluxbox_paul-dee1ec29d0db48b8a721e8152a980f1379e332af.tar.bz2 | |
Convert windowmenu to lua
also, i've restored the autoreloading capability of menus.
Diffstat (limited to 'src/MenuCreator.hh')
| -rw-r--r-- | src/MenuCreator.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/MenuCreator.hh b/src/MenuCreator.hh index 4329639..0d13529 100644 --- a/src/MenuCreator.hh +++ b/src/MenuCreator.hh | |||
| @@ -41,9 +41,9 @@ class FbMenu; | |||
| 41 | class FluxboxWindow; | 41 | class FluxboxWindow; |
| 42 | 42 | ||
| 43 | namespace MenuCreator { | 43 | namespace MenuCreator { |
| 44 | 44 | void | |
| 45 | std::auto_ptr<FbMenu> | 45 | createMenu(FbMenu &inject_into, lua::state &l, int screen_number, |
| 46 | createMenu(lua::state &l, int screen_number, FbTk::AutoReloadHelper *reloader = NULL); | 46 | FbTk::AutoReloadHelper *reloader = NULL); |
| 47 | FbMenu *createMenu(const std::string &label, int screen_num); | 47 | FbMenu *createMenu(const std::string &label, int screen_num); |
| 48 | FbMenu *createMenuType(const std::string &label, int screen_num); | 48 | FbMenu *createMenuType(const std::string &label, int screen_num); |
| 49 | bool createFromFile(const std::string &filename, | 49 | bool createFromFile(const std::string &filename, |