aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/MenuItem.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/FbTk/MenuItem.hh
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/FbTk/MenuItem.hh')
-rw-r--r--src/FbTk/MenuItem.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index afb6be9..7fac8c7 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -101,6 +101,9 @@ public:
101 */ 101 */
102 //@{ 102 //@{
103 virtual const std::string &label() const { return m_label; } 103 virtual const std::string &label() const { return m_label; }
104 virtual const PixmapWithMask *icon() const {
105 return m_icon.get() ? m_icon->pixmap.get() : 0;
106 }
104 virtual const Menu *submenu() const { return m_submenu; } 107 virtual const Menu *submenu() const { return m_submenu; }
105 virtual bool isEnabled() const { return m_enabled; } 108 virtual bool isEnabled() const { return m_enabled; }
106 virtual bool isSelected() const { return m_selected; } 109 virtual bool isSelected() const { return m_selected; }