diff options
author | simonb <simonb> | 2007-01-07 11:55:14 (GMT) |
---|---|---|
committer | simonb <simonb> | 2007-01-07 11:55:14 (GMT) |
commit | 1cc7b60aa2c2e7a26f9ff6f1461ca0b8a97be8de (patch) | |
tree | 1de2b149b23e589a36c81bd2aa51092db7b6e190 /src/FbTk | |
parent | cfd33dd7a8f392253d8af9f418d86dc3083fc27d (diff) | |
download | fluxbox_paul-1cc7b60aa2c2e7a26f9ff6f1461ca0b8a97be8de.zip fluxbox_paul-1cc7b60aa2c2e7a26f9ff6f1461ca0b8a97be8de.tar.bz2 |
per-window transparency, including apps and menu support, plus some
infrastructure and related changes. Thanks for original patch from
Julien Trolet, dmxen at sourceforge dot net
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Menu.hh | 2 | ||||
-rw-r--r-- | src/FbTk/MenuItem.hh | 16 | ||||
-rw-r--r-- | src/FbTk/Resource.hh | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 7863fcb..28eb70a 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh | |||
@@ -116,7 +116,7 @@ public: | |||
116 | /// set label string | 116 | /// set label string |
117 | void setLabel(const FbString &labelstr); | 117 | void setLabel(const FbString &labelstr); |
118 | /// move menu to x,y | 118 | /// move menu to x,y |
119 | void move(int x, int y); | 119 | virtual void move(int x, int y); |
120 | virtual void updateMenu(int active_index = -1); | 120 | virtual void updateMenu(int active_index = -1); |
121 | void setItemSelected(unsigned int index, bool val); | 121 | void setItemSelected(unsigned int index, bool val); |
122 | void setItemEnabled(unsigned int index, bool val); | 122 | void setItemEnabled(unsigned int index, bool val); |
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh index 94f0775..d73c270 100644 --- a/src/FbTk/MenuItem.hh +++ b/src/FbTk/MenuItem.hh | |||
@@ -90,21 +90,21 @@ public: | |||
90 | virtual ~MenuItem() { } | 90 | virtual ~MenuItem() { } |
91 | 91 | ||
92 | inline void setCommand(RefCount<Command> &cmd) { m_command = cmd; } | 92 | inline void setCommand(RefCount<Command> &cmd) { m_command = cmd; } |
93 | virtual inline void setSelected(bool selected) { m_selected = selected; } | 93 | virtual void setSelected(bool selected) { m_selected = selected; } |
94 | virtual inline void setEnabled(bool enabled) { m_enabled = enabled; } | 94 | virtual void setEnabled(bool enabled) { m_enabled = enabled; } |
95 | virtual inline void setLabel(const FbString &label) { m_label = label; } | 95 | virtual void setLabel(const FbString &label) { m_label = label; } |
96 | virtual inline void setToggleItem(bool val) { m_toggle_item = val; } | 96 | virtual void setToggleItem(bool val) { m_toggle_item = val; } |
97 | void setIcon(const std::string &filename, int screen_num); | 97 | void setIcon(const std::string &filename, int screen_num); |
98 | virtual Menu *submenu() { return m_submenu; } | 98 | virtual Menu *submenu() { return m_submenu; } |
99 | /** | 99 | /** |
100 | @name accessors | 100 | @name accessors |
101 | */ | 101 | */ |
102 | //@{ | 102 | //@{ |
103 | virtual inline const std::string &label() const { return m_label; } | 103 | virtual const std::string &label() const { return m_label; } |
104 | virtual const Menu *submenu() const { return m_submenu; } | 104 | virtual const Menu *submenu() const { return m_submenu; } |
105 | virtual inline bool isEnabled() const { return m_enabled; } | 105 | virtual bool isEnabled() const { return m_enabled; } |
106 | virtual inline bool isSelected() const { return m_selected; } | 106 | virtual bool isSelected() const { return m_selected; } |
107 | virtual inline bool isToggleItem() const { return m_toggle_item; } | 107 | virtual bool isToggleItem() const { return m_toggle_item; } |
108 | virtual unsigned int width(const MenuTheme &theme) const; | 108 | virtual unsigned int width(const MenuTheme &theme) const; |
109 | virtual unsigned int height(const MenuTheme &theme) const; | 109 | virtual unsigned int height(const MenuTheme &theme) const; |
110 | virtual void draw(FbDrawable &drawable, | 110 | virtual void draw(FbDrawable &drawable, |
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index bdce09d..55eeddc 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh | |||
@@ -192,6 +192,7 @@ public: | |||
192 | /// @return string value of resource | 192 | /// @return string value of resource |
193 | std::string getString() const; | 193 | std::string getString() const; |
194 | 194 | ||
195 | inline T& get() { return m_value; } | ||
195 | inline T& operator*() { return m_value; } | 196 | inline T& operator*() { return m_value; } |
196 | inline const T& operator*() const { return m_value; } | 197 | inline const T& operator*() const { return m_value; } |
197 | inline T *operator->() { return &m_value; } | 198 | inline T *operator->() { return &m_value; } |