diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-05 01:39:19 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-05 01:39:19 (GMT) |
commit | ac1bd7e0981222bf340ce7defb2bb8307d42a0a2 (patch) | |
tree | c8fb9c618184e7ac44f6138409cab3fab86b23e4 /src/FbTk/MenuItem.hh | |
parent | 60ba709c2f47cc2c7b877aef1b0f297b097853e5 (diff) | |
download | fluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.zip fluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.tar.bz2 |
update code to use ThemeProxy
Diffstat (limited to 'src/FbTk/MenuItem.hh')
-rw-r--r-- | src/FbTk/MenuItem.hh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh index d858340..8c73036 100644 --- a/src/FbTk/MenuItem.hh +++ b/src/FbTk/MenuItem.hh | |||
@@ -35,6 +35,7 @@ namespace FbTk { | |||
35 | class Menu; | 35 | class Menu; |
36 | class MenuTheme; | 36 | class MenuTheme; |
37 | class FbDrawable; | 37 | class FbDrawable; |
38 | template <class T> class ThemeProxy; | ||
38 | 39 | ||
39 | /// An interface for a menu item in Menu | 40 | /// An interface for a menu item in Menu |
40 | class MenuItem : public FbTk::ITypeAheadable { | 41 | class MenuItem : public FbTk::ITypeAheadable { |
@@ -116,21 +117,21 @@ public: | |||
116 | virtual int getIndex() { return m_index; } | 117 | virtual int getIndex() { return m_index; } |
117 | const std::string &iTypeString() const { return m_label; } | 118 | const std::string &iTypeString() const { return m_label; } |
118 | virtual void drawLine(FbDrawable &draw, | 119 | virtual void drawLine(FbDrawable &draw, |
119 | const MenuTheme &theme, | 120 | const FbTk::ThemeProxy<MenuTheme> &theme, |
120 | size_t size, | 121 | size_t size, |
121 | int text_x, int text_y, | 122 | int text_x, int text_y, |
122 | unsigned int width) const; | 123 | unsigned int width) const; |
123 | 124 | ||
124 | virtual unsigned int width(const MenuTheme &theme) const; | 125 | virtual unsigned int width(const FbTk::ThemeProxy<MenuTheme> &theme) const; |
125 | virtual unsigned int height(const MenuTheme &theme) const; | 126 | virtual unsigned int height(const FbTk::ThemeProxy<MenuTheme> &theme) const; |
126 | virtual void draw(FbDrawable &drawable, | 127 | virtual void draw(FbDrawable &drawable, |
127 | const MenuTheme &theme, | 128 | const FbTk::ThemeProxy<MenuTheme> &theme, |
128 | bool highlight, | 129 | bool highlight, |
129 | // "foreground" is the transient bits - more likely to change | 130 | // "foreground" is the transient bits - more likely to change |
130 | bool draw_foreground, bool draw_background, | 131 | bool draw_foreground, bool draw_background, |
131 | int x, int y, | 132 | int x, int y, |
132 | unsigned int width, unsigned int height) const; | 133 | unsigned int width, unsigned int height) const; |
133 | virtual void updateTheme(const MenuTheme &theme); | 134 | virtual void updateTheme(const FbTk::ThemeProxy<MenuTheme> &theme); |
134 | /** | 135 | /** |
135 | Called when the item was clicked with a specific button | 136 | Called when the item was clicked with a specific button |
136 | @param button the button number | 137 | @param button the button number |