aboutsummaryrefslogtreecommitdiff
path: root/src/Container.hh
diff options
context:
space:
mode:
authormathias <mathias>2004-12-13 14:03:17 (GMT)
committermathias <mathias>2004-12-13 14:03:17 (GMT)
commiteb42a7806d0af854cc4bdfa8f194a0bb67446153 (patch)
tree5a8a22b0705ee927a16265f1a754159835fb22d9 /src/Container.hh
parent7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff)
downloadfluxbox-eb42a7806d0af854cc4bdfa8f194a0bb67446153.zip
fluxbox-eb42a7806d0af854cc4bdfa8f194a0bb67446153.tar.bz2
icc complaint about a "possible" conflict between the
FbTk::Menu::update(Subject*) and FbTk::Menu::update(int index) to avoid this, we rename FbTk::Menu::update(int index) -> FbTk::Menu::updateMenu(int index) this is mostly cosmetic, but if it makes the life of a compiler happy, well .. be happy icc :)
Diffstat (limited to 'src/Container.hh')
-rw-r--r--src/Container.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Container.hh b/src/Container.hh
index 3b05385..d6c34ed 100644
--- a/src/Container.hh
+++ b/src/Container.hh
@@ -69,7 +69,7 @@ public:
69 inline Alignment alignment() const { return m_align; } 69 inline Alignment alignment() const { return m_align; }
70 inline int size() const { return m_item_list.size(); } 70 inline int size() const { return m_item_list.size(); }
71 inline bool empty() const { return m_item_list.empty(); } 71 inline bool empty() const { return m_item_list.empty(); }
72 inline const Item selected() const { return m_selected; } 72 inline const Item& selected() const { return m_selected; }
73 inline Item selected() { return m_selected; } 73 inline Item selected() { return m_selected; }
74 unsigned int maxWidthPerClient() const; 74 unsigned int maxWidthPerClient() const;
75 inline unsigned int maxHeightPerClient() const { return (empty() ? height() : height()/size()); } 75 inline unsigned int maxHeightPerClient() const { return (empty() ? height() : height()/size()); }