diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
commit | e1f362ae764884a4cd1e1673292cb37d5a85f89c (patch) | |
tree | 137430b26aee6f3638f27281d3757c2c75ef4b20 /src/FbTk/MenuItem.hh | |
parent | e90c3678d9e54bc9251619fdee2d7341f042167b (diff) | |
download | fluxbox_paul-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip fluxbox_paul-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2 |
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/FbTk/MenuItem.hh')
-rw-r--r-- | src/FbTk/MenuItem.hh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh index b6777b7..b907e31 100644 --- a/src/FbTk/MenuItem.hh +++ b/src/FbTk/MenuItem.hh | |||
@@ -92,7 +92,7 @@ public: | |||
92 | { } | 92 | { } |
93 | virtual ~MenuItem() { } | 93 | virtual ~MenuItem() { } |
94 | 94 | ||
95 | inline void setCommand(RefCount<Command> &cmd) { m_command = cmd; } | 95 | void setCommand(RefCount<Command> &cmd) { m_command = cmd; } |
96 | virtual void setSelected(bool selected) { m_selected = selected; } | 96 | virtual void setSelected(bool selected) { m_selected = selected; } |
97 | virtual void setEnabled(bool enabled) { m_enabled = enabled; } | 97 | virtual void setEnabled(bool enabled) { m_enabled = enabled; } |
98 | virtual void setLabel(const FbString &label) { m_label = label; } | 98 | virtual void setLabel(const FbString &label) { m_label = label; } |
@@ -100,7 +100,7 @@ public: | |||
100 | void setCloseOnClick(bool val) { m_close_on_click = val; } | 100 | void setCloseOnClick(bool val) { m_close_on_click = val; } |
101 | void setIcon(const std::string &filename, int screen_num); | 101 | void setIcon(const std::string &filename, int screen_num); |
102 | virtual Menu *submenu() { return m_submenu; } | 102 | virtual Menu *submenu() { return m_submenu; } |
103 | /** | 103 | /** |
104 | @name accessors | 104 | @name accessors |
105 | */ | 105 | */ |
106 | //@{ | 106 | //@{ |
@@ -108,15 +108,15 @@ public: | |||
108 | virtual const PixmapWithMask *icon() const { | 108 | virtual const PixmapWithMask *icon() const { |
109 | return m_icon.get() ? m_icon->pixmap.get() : 0; | 109 | return m_icon.get() ? m_icon->pixmap.get() : 0; |
110 | } | 110 | } |
111 | virtual const Menu *submenu() const { return m_submenu; } | 111 | virtual const Menu *submenu() const { return m_submenu; } |
112 | virtual bool isEnabled() const { return m_enabled; } | 112 | virtual bool isEnabled() const { return m_enabled; } |
113 | virtual bool isSelected() const { return m_selected; } | 113 | virtual bool isSelected() const { return m_selected; } |
114 | virtual bool isToggleItem() const { return m_toggle_item; } | 114 | virtual bool isToggleItem() const { return m_toggle_item; } |
115 | 115 | ||
116 | // iType functions | 116 | // iType functions |
117 | virtual inline void setIndex(int index) { m_index = index; } | 117 | virtual void setIndex(int index) { m_index = index; } |
118 | virtual inline int getIndex() { return m_index; } | 118 | virtual int getIndex() { return m_index; } |
119 | inline const std::string &iTypeString() const { return m_label; } | 119 | const std::string &iTypeString() const { return m_label; } |
120 | virtual void drawLine(FbDrawable &draw, | 120 | virtual void drawLine(FbDrawable &draw, |
121 | const MenuTheme &theme, | 121 | const MenuTheme &theme, |
122 | size_t size, | 122 | size_t size, |
@@ -125,7 +125,7 @@ public: | |||
125 | 125 | ||
126 | virtual unsigned int width(const MenuTheme &theme) const; | 126 | virtual unsigned int width(const MenuTheme &theme) const; |
127 | virtual unsigned int height(const MenuTheme &theme) const; | 127 | virtual unsigned int height(const MenuTheme &theme) const; |
128 | virtual void draw(FbDrawable &drawable, | 128 | virtual void draw(FbDrawable &drawable, |
129 | const MenuTheme &theme, | 129 | const MenuTheme &theme, |
130 | bool highlight, | 130 | bool highlight, |
131 | // "foreground" is the transient bits - more likely to change | 131 | // "foreground" is the transient bits - more likely to change |
@@ -136,7 +136,7 @@ public: | |||
136 | /** | 136 | /** |
137 | Called when the item was clicked with a specific button | 137 | Called when the item was clicked with a specific button |
138 | @param button the button number | 138 | @param button the button number |
139 | @param time the time stamp | 139 | @param time the time stamp |
140 | */ | 140 | */ |
141 | virtual void click(int button, int time, unsigned int mods); | 141 | virtual void click(int button, int time, unsigned int mods); |
142 | /// must use this to show submenu to ensure consistency for object like window menu in ClientMenu (see Workspace.cc) | 142 | /// must use this to show submenu to ensure consistency for object like window menu in ClientMenu (see Workspace.cc) |
@@ -147,7 +147,7 @@ public: | |||
147 | 147 | ||
148 | void setMenu(Menu &menu) { m_menu = &menu; } | 148 | void setMenu(Menu &menu) { m_menu = &menu; } |
149 | Menu *menu() { return m_menu; } | 149 | Menu *menu() { return m_menu; } |
150 | 150 | ||
151 | private: | 151 | private: |
152 | FbString m_label; ///< label of this item | 152 | FbString m_label; ///< label of this item |
153 | Menu *m_menu; ///< the menu we live in | 153 | Menu *m_menu; ///< the menu we live in |