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/FbCommands.hh | |
parent | 5ecebae4770cbe7e4feea46d2c074a818f1c9662 (diff) | |
parent | d7aa526d9275f7c94f0b1ce27464eaf3dae0d78d (diff) | |
download | fluxbox_paul-7f45bae4629f345906e96c1fcb3a3d1e49c36382.zip fluxbox_paul-7f45bae4629f345906e96c1fcb3a3d1e49c36382.tar.bz2 |
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Diffstat (limited to 'src/FbCommands.hh')
-rw-r--r-- | src/FbCommands.hh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/FbCommands.hh b/src/FbCommands.hh index f9c33af..811fb78 100644 --- a/src/FbCommands.hh +++ b/src/FbCommands.hh | |||
@@ -25,7 +25,8 @@ | |||
25 | #define FBCOMMANDS_HH | 25 | #define FBCOMMANDS_HH |
26 | 26 | ||
27 | #include "FbTk/Command.hh" | 27 | #include "FbTk/Command.hh" |
28 | #include "FbTk/RefCount.hh" | 28 | |
29 | #include <memory> | ||
29 | 30 | ||
30 | #include "ClientMenu.hh" | 31 | #include "ClientMenu.hh" |
31 | #include "ClientPattern.hh" | 32 | #include "ClientPattern.hh" |
@@ -124,16 +125,17 @@ private: | |||
124 | const int m_option; | 125 | const int m_option; |
125 | const ClientPattern m_pat; | 126 | const ClientPattern m_pat; |
126 | std::list<FluxboxWindow *> m_list; | 127 | std::list<FluxboxWindow *> m_list; |
127 | FbTk::RefCount<ClientMenu> m_menu; | 128 | std::auto_ptr<ClientMenu> m_menu; |
128 | }; | 129 | }; |
129 | 130 | ||
130 | class ShowCustomMenuCmd: public FbTk::Command<void> { | 131 | class ShowCustomMenuCmd: public FbTk::Command<void> { |
131 | public: | 132 | public: |
132 | explicit ShowCustomMenuCmd(const std::string &arguments); | 133 | explicit ShowCustomMenuCmd(const std::string &arguments); |
133 | void execute(); | 134 | void execute(); |
135 | void reload(); | ||
134 | private: | 136 | private: |
135 | std::string custom_menu_file; | 137 | std::string custom_menu_file; |
136 | FbTk::RefCount<FbTk::Menu> m_menu; | 138 | std::auto_ptr<FbMenu> m_menu; |
137 | }; | 139 | }; |
138 | 140 | ||
139 | class ShowRootMenuCmd: public FbTk::Command<void> { | 141 | class ShowRootMenuCmd: public FbTk::Command<void> { |