aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/MultiButtonMenuItem.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-08 22:07:58 (GMT)
committerfluxgen <fluxgen>2004-01-08 22:07:58 (GMT)
commitf25aab19562fe50c36fac186f2eb5bd3383e2173 (patch)
tree6b509dfbf50285a378122812a78f7c6a319b4b46 /src/FbTk/MultiButtonMenuItem.cc
parent5643caa65520c7410a87e6daaa55e3b7adb005f8 (diff)
downloadfluxbox-f25aab19562fe50c36fac186f2eb5bd3383e2173.zip
fluxbox-f25aab19562fe50c36fac186f2eb5bd3383e2173.tar.bz2
cleaning
Diffstat (limited to 'src/FbTk/MultiButtonMenuItem.cc')
-rw-r--r--src/FbTk/MultiButtonMenuItem.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc
index 23b6abf..af1175d 100644
--- a/src/FbTk/MultiButtonMenuItem.cc
+++ b/src/FbTk/MultiButtonMenuItem.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: MultiButtonMenuItem.cc,v 1.1 2003/11/27 13:20:57 fluxgen Exp $ 23// $Id: MultiButtonMenuItem.cc,v 1.2 2004/01/08 22:07:28 fluxgen Exp $
24 24
25#include "MultiButtonMenuItem.hh" 25#include "MultiButtonMenuItem.hh"
26 26
@@ -28,15 +28,15 @@ namespace FbTk {
28 28
29MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const char *label): 29MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const char *label):
30 MenuItem(label), 30 MenuItem(label),
31 m_buttons(buttons), 31 m_button_exe(0),
32 m_button_exe(0) { 32 m_buttons(buttons) {
33 init(buttons); 33 init(buttons);
34} 34}
35 35
36MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const char *label, Menu *submenu): 36MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const char *label, Menu *submenu):
37 MenuItem(label, submenu), 37 MenuItem(label, submenu),
38 m_buttons(buttons), 38 m_button_exe(0),
39 m_button_exe(0) { 39 m_buttons(buttons) {
40 init(buttons); 40 init(buttons);
41} 41}
42 42
@@ -46,13 +46,13 @@ MultiButtonMenuItem::~MultiButtonMenuItem() {
46} 46}
47 47
48void MultiButtonMenuItem::setCommand(int button, FbTk::RefCount<FbTk::Command> &cmd) { 48void MultiButtonMenuItem::setCommand(int button, FbTk::RefCount<FbTk::Command> &cmd) {
49 if (button <= 0 || button > buttons() || buttons() == 0) 49 if (button <= 0 || button > static_cast<signed>(buttons()) || buttons() == 0)
50 return; 50 return;
51 m_button_exe[button - 1] = cmd; 51 m_button_exe[button - 1] = cmd;
52} 52}
53 53
54void MultiButtonMenuItem::click(int button, int time) { 54void MultiButtonMenuItem::click(int button, int time) {
55 if (button <= 0 || button > buttons() || buttons() == 0) 55 if (button <= 0 || button > static_cast<signed>(buttons()) || buttons() == 0)
56 return; 56 return;
57 57
58 if (*m_button_exe[button - 1] != 0) 58 if (*m_button_exe[button - 1] != 0)