diff options
author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-05-13 15:07:30 (GMT) |
---|---|---|
committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-05-13 15:07:30 (GMT) |
commit | 7f45bae4629f345906e96c1fcb3a3d1e49c36382 (patch) | |
tree | b09708632d29ac4471c57446eb726e5401c8570f /src/FbMenu.hh | |
parent | 5ecebae4770cbe7e4feea46d2c074a818f1c9662 (diff) | |
parent | d7aa526d9275f7c94f0b1ce27464eaf3dae0d78d (diff) | |
download | fluxbox-7f45bae4629f345906e96c1fcb3a3d1e49c36382.zip fluxbox-7f45bae4629f345906e96c1fcb3a3d1e49c36382.tar.bz2 |
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Diffstat (limited to 'src/FbMenu.hh')
-rw-r--r-- | src/FbMenu.hh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/FbMenu.hh b/src/FbMenu.hh index b9c4654..11ed3c3 100644 --- a/src/FbMenu.hh +++ b/src/FbMenu.hh | |||
@@ -22,8 +22,11 @@ | |||
22 | #ifndef FBMENU_HH | 22 | #ifndef FBMENU_HH |
23 | #define FBMENU_HH | 23 | #define FBMENU_HH |
24 | 24 | ||
25 | #include <memory> | ||
26 | |||
25 | #include "FbTk/Menu.hh" | 27 | #include "FbTk/Menu.hh" |
26 | #include "FbTk/XLayerItem.hh" | 28 | #include "FbTk/XLayerItem.hh" |
29 | #include "FbTk/AutoReloadHelper.hh" | ||
27 | 30 | ||
28 | class FluxboxWindow; | 31 | class FluxboxWindow; |
29 | 32 | ||
@@ -44,11 +47,15 @@ public: | |||
44 | void buttonReleaseEvent(XButtonEvent &be); | 47 | void buttonReleaseEvent(XButtonEvent &be); |
45 | void keyPressEvent(XKeyEvent &ke); | 48 | void keyPressEvent(XKeyEvent &ke); |
46 | 49 | ||
50 | void setReloadHelper(FbTk::AutoReloadHelper *helper) { m_reloader.reset(helper); } | ||
51 | FbTk::AutoReloadHelper *reloadHelper() { return m_reloader.get(); } | ||
52 | |||
47 | static void setWindow(FluxboxWindow *win) { s_window = win; } | 53 | static void setWindow(FluxboxWindow *win) { s_window = win; } |
48 | static FluxboxWindow *window() { return s_window; } | 54 | static FluxboxWindow *window() { return s_window; } |
49 | 55 | ||
50 | private: | 56 | private: |
51 | FbTk::XLayerItem m_layeritem; | 57 | FbTk::XLayerItem m_layeritem; |
58 | std::auto_ptr<FbTk::AutoReloadHelper> m_reloader; | ||
52 | static FluxboxWindow *s_window; | 59 | static FluxboxWindow *s_window; |
53 | }; | 60 | }; |
54 | 61 | ||