aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/ImageControl.hh2
-rw-r--r--src/FbTk/Menu.hh2
-rw-r--r--src/FbTk/RefCount.hh2
-rw-r--r--src/FbTk/TextButton.cc2
-rw-r--r--src/FbTk/TextButton.hh4
5 files changed, 11 insertions, 1 deletions
diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh
index a0f1cc7..fbf05e8 100644
--- a/src/FbTk/ImageControl.hh
+++ b/src/FbTk/ImageControl.hh
@@ -48,7 +48,9 @@ public:
48 virtual ~ImageControl(); 48 virtual ~ImageControl();
49 49
50 inline bool doDither() const { return m_dither; } 50 inline bool doDither() const { return m_dither; }
51#ifdef NOT_USED
51 inline int bitsPerPixel() const { return bits_per_pixel; } 52 inline int bitsPerPixel() const { return bits_per_pixel; }
53#endif
52 inline int depth() const { return m_screen_depth; } 54 inline int depth() const { return m_screen_depth; }
53 inline int colorsPerChannel() const { return m_colors_per_channel; } 55 inline int colorsPerChannel() const { return m_colors_per_channel; }
54 inline int screenNumber() const { return m_screen_num; } 56 inline int screenNumber() const { return m_screen_num; }
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 4490eb8..f8a7db8 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -131,7 +131,6 @@ public:
131 virtual void clearWindow(); 131 virtual void clearWindow();
132#ifdef NOT_USED 132#ifdef NOT_USED
133 void setActiveIndex(int index) { m_active_index = index; } 133 void setActiveIndex(int index) { m_active_index = index; }
134#endif
135 /*@}*/ 134 /*@}*/
136 135
137 /** 136 /**
@@ -139,6 +138,7 @@ public:
139 */ 138 */
140 //@{ 139 //@{
141 inline int activeIndex() const { return m_active_index; } 140 inline int activeIndex() const { return m_active_index; }
141#endif
142 inline bool isTorn() const { return m_torn; } 142 inline bool isTorn() const { return m_torn; }
143 inline bool isVisible() const { return m_visible; } 143 inline bool isVisible() const { return m_visible; }
144 inline int screenNumber() const { return menu.window.screenNumber(); } 144 inline int screenNumber() const { return menu.window.screenNumber(); }
diff --git a/src/FbTk/RefCount.hh b/src/FbTk/RefCount.hh
index 96d64d8..ba2a697 100644
--- a/src/FbTk/RefCount.hh
+++ b/src/FbTk/RefCount.hh
@@ -38,8 +38,10 @@ public:
38 Pointer *operator * () const { return get(); } 38 Pointer *operator * () const { return get(); }
39 Pointer *operator -> () const { return get(); } 39 Pointer *operator -> () const { return get(); }
40 Pointer *get() const { return m_data; } 40 Pointer *get() const { return m_data; }
41#ifdef NOT_USED
41 /// @return number of referenses 42 /// @return number of referenses
42 unsigned int usedBy() const { return (m_refcount != 0 ? *m_refcount : 0); } 43 unsigned int usedBy() const { return (m_refcount != 0 ? *m_refcount : 0); }
44#endif
43private: 45private:
44 /// increase referense count 46 /// increase referense count
45 void incRefCount(); 47 void incRefCount();
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 948f847..9aee7f2 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -139,10 +139,12 @@ unsigned int TextButton::textWidth() const {
139 return font().textWidth(text().data(), text().size()); 139 return font().textWidth(text().data(), text().size());
140} 140}
141 141
142#ifdef NOT_USED
142unsigned int TextButton::textHeight() const { 143unsigned int TextButton::textHeight() const {
143 return font().height(); 144 return font().height();
144 145
145} 146}
147#endif
146 148
147void TextButton::renderForeground(FbWindow &win, FbDrawable &drawable) { 149void TextButton::renderForeground(FbWindow &win, FbDrawable &drawable) {
148 // (win should always be *this, no need to check) 150 // (win should always be *this, no need to check)
diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh
index 26a2469..7684b29 100644
--- a/src/FbTk/TextButton.hh
+++ b/src/FbTk/TextButton.hh
@@ -71,10 +71,14 @@ public:
71 inline FbTk::Font &font() const { return *m_font; } 71 inline FbTk::Font &font() const { return *m_font; }
72 inline FbTk::Orientation orientation() const { return m_orientation; } 72 inline FbTk::Orientation orientation() const { return m_orientation; }
73 unsigned int textWidth() const; 73 unsigned int textWidth() const;
74#ifdef NOT_USED
74 unsigned int textHeight() const; 75 unsigned int textHeight() const;
76#endif
75 int bevel() const { return m_bevel; } 77 int bevel() const { return m_bevel; }
78#ifdef NOT_USED
76 unsigned int leftPadding() const { return m_left_padding; } 79 unsigned int leftPadding() const { return m_left_padding; }
77 unsigned int rightPadding() const { return m_right_padding; } 80 unsigned int rightPadding() const { return m_right_padding; }
81#endif
78 82
79 void renderForeground(FbWindow &win, FbDrawable &drawable); 83 void renderForeground(FbWindow &win, FbDrawable &drawable);
80 84