aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/EventHandler.hh2
-rw-r--r--src/FbTk/EventManager.cc2
-rw-r--r--src/FbTk/FbDrawable.cc2
-rw-r--r--src/FbTk/FbDrawable.hh2
-rw-r--r--src/FbTk/FbWindow.cc2
-rw-r--r--src/FbTk/FbWindow.hh2
-rw-r--r--src/FbTk/GContext.hh7
-rw-r--r--src/FbTk/ImageControl.cc8
-rw-r--r--src/FbTk/ImageControl.hh4
-rw-r--r--src/FbTk/Menu.hh4
-rw-r--r--src/FbTk/SignalHandler.cc2
-rw-r--r--src/FbTk/SignalHandler.hh2
-rw-r--r--src/FbTk/TextButton.cc2
-rw-r--r--src/FbTk/TextButton.hh2
-rw-r--r--src/FbTk/TextureRender.hh1
15 files changed, 36 insertions, 8 deletions
diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh
index 62e2cb9..3d2e545 100644
--- a/src/FbTk/EventHandler.hh
+++ b/src/FbTk/EventHandler.hh
@@ -54,7 +54,9 @@ public:
54 virtual void exposeEvent(XExposeEvent &) { } 54 virtual void exposeEvent(XExposeEvent &) { }
55 virtual void motionNotifyEvent(XMotionEvent &) { } 55 virtual void motionNotifyEvent(XMotionEvent &) { }
56 virtual void keyPressEvent(XKeyEvent &) { } 56 virtual void keyPressEvent(XKeyEvent &) { }
57#ifdef NOT_USED
57 virtual void keyReleaseEvent(XKeyEvent &) { } 58 virtual void keyReleaseEvent(XKeyEvent &) { }
59#endif
58 virtual void leaveNotifyEvent(XCrossingEvent &) { } 60 virtual void leaveNotifyEvent(XCrossingEvent &) { }
59 virtual void enterNotifyEvent(XCrossingEvent &) { } 61 virtual void enterNotifyEvent(XCrossingEvent &) { }
60}; 62};
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index 759c114..3370fb5 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -153,7 +153,9 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) {
153 evhand->keyPressEvent(ev.xkey); 153 evhand->keyPressEvent(ev.xkey);
154 break; 154 break;
155 case KeyRelease: 155 case KeyRelease:
156#ifdef NOT_USED
156 evhand->keyReleaseEvent(ev.xkey); 157 evhand->keyReleaseEvent(ev.xkey);
158#endif
157 break; 159 break;
158 case ButtonPress: 160 case ButtonPress:
159 evhand->buttonPressEvent(ev.xbutton); 161 evhand->buttonPressEvent(ev.xbutton);
diff --git a/src/FbTk/FbDrawable.cc b/src/FbTk/FbDrawable.cc
index 15ebb7f..061da0b 100644
--- a/src/FbTk/FbDrawable.cc
+++ b/src/FbTk/FbDrawable.cc
@@ -89,11 +89,13 @@ void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints,
89 shape, mode); 89 shape, mode);
90} 90}
91 91
92#ifdef NOT_USED
92void FbDrawable::drawPoint(GC gc, int x, int y) { 93void FbDrawable::drawPoint(GC gc, int x, int y) {
93 if (drawable() == 0 || gc == 0) 94 if (drawable() == 0 || gc == 0)
94 return; 95 return;
95 XDrawPoint(s_display, drawable(), gc, x, y); 96 XDrawPoint(s_display, drawable(), gc, x, y);
96} 97}
98#endif
97 99
98XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const { 100XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const {
99 return XGetImage(s_display, drawable(), 101 return XGetImage(s_display, drawable(),
diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh
index 347b207..7590f54 100644
--- a/src/FbTk/FbDrawable.hh
+++ b/src/FbTk/FbDrawable.hh
@@ -48,7 +48,9 @@ public:
48 virtual void fillPolygon(GC gc, XPoint *points, int npoints, 48 virtual void fillPolygon(GC gc, XPoint *points, int npoints,
49 int shape, int mode); 49 int shape, int mode);
50 50
51#ifdef NOT_USED
51 virtual void drawPoint(GC gc, int x, int y); 52 virtual void drawPoint(GC gc, int x, int y);
53#endif
52 54
53 virtual XImage *image(int x, int y, unsigned int width, unsigned int height) const; 55 virtual XImage *image(int x, int y, unsigned int width, unsigned int height) const;
54 56
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 090b788..2bf96f6 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -449,9 +449,11 @@ void FbWindow::setCursor(Cursor cur) {
449 XDefineCursor(display(), window(), cur); 449 XDefineCursor(display(), window(), cur);
450} 450}
451 451
452#ifdef NOT_USED
452void FbWindow::unsetCursor() { 453void FbWindow::unsetCursor() {
453 XUndefineCursor(display(), window()); 454 XUndefineCursor(display(), window());
454} 455}
456#endif
455 457
456void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) { 458void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) {
457 XReparentWindow(display(), window(), parent.window(), x, y); 459 XReparentWindow(display(), window(), parent.window(), x, y);
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index 1f0c4bd..c5494b0 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -140,8 +140,10 @@ public:
140 void setInputFocus(int revert_to, int time); 140 void setInputFocus(int revert_to, int time);
141 /// defines a cursor for this window 141 /// defines a cursor for this window
142 void setCursor(Cursor cur); 142 void setCursor(Cursor cur);
143#ifdef NOT_USED
143 /// uses the parents cursor instead 144 /// uses the parents cursor instead
144 void unsetCursor(); 145 void unsetCursor();
146#endif
145 void reparent(const FbWindow &parent, int x, int y, bool continuing = true); 147 void reparent(const FbWindow &parent, int x, int y, bool continuing = true);
146 148
147 bool property(Atom property, 149 bool property(Atom property,
diff --git a/src/FbTk/GContext.hh b/src/FbTk/GContext.hh
index a5e41c2..047de6f 100644
--- a/src/FbTk/GContext.hh
+++ b/src/FbTk/GContext.hh
@@ -93,7 +93,7 @@ public:
93 inline void setFont(int fid) { 93 inline void setFont(int fid) {
94 XSetFont(m_display, m_gc, fid); 94 XSetFont(m_display, m_gc, fid);
95 } 95 }
96 96#ifdef NOT_USED
97 inline void setClipMask(const FbTk::FbPixmap &mask) { 97 inline void setClipMask(const FbTk::FbPixmap &mask) {
98 XSetClipMask(m_display, m_gc, mask.drawable()); 98 XSetClipMask(m_display, m_gc, mask.drawable());
99 } 99 }
@@ -101,7 +101,7 @@ public:
101 inline void setClipOrigin(int x, int y) { 101 inline void setClipOrigin(int x, int y) {
102 XSetClipOrigin(m_display, m_gc, x, y); 102 XSetClipOrigin(m_display, m_gc, x, y);
103 } 103 }
104 104#endif
105 inline void setGraphicsExposure(bool value) { 105 inline void setGraphicsExposure(bool value) {
106 XSetGraphicsExposures(m_display, m_gc, value); 106 XSetGraphicsExposures(m_display, m_gc, value);
107 } 107 }
@@ -116,10 +116,11 @@ public:
116 inline void setFillStyle(int style) { 116 inline void setFillStyle(int style) {
117 XSetFillStyle(m_display, m_gc, style); 117 XSetFillStyle(m_display, m_gc, style);
118 } 118 }
119#ifdef NOT_USED
119 inline void setFillRule(int rule) { 120 inline void setFillRule(int rule) {
120 XSetFillRule(m_display, m_gc, rule); 121 XSetFillRule(m_display, m_gc, rule);
121 } 122 }
122 123#endif
123 inline void setLineAttributes(unsigned int width, 124 inline void setLineAttributes(unsigned int width,
124 int line_style, 125 int line_style,
125 int cap_style, 126 int cap_style,
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index 64e3db5..f209958 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -311,12 +311,12 @@ void ImageControl::colorTables(const unsigned char **rmt, const unsigned char **
311 if (bbit) *bbit = blue_bits; 311 if (bbit) *bbit = blue_bits;
312} 312}
313 313
314 314#ifdef NOT_USED
315void ImageControl::getXColorTable(XColor **c, int *n) { 315void ImageControl::getXColorTable(XColor **c, int *n) {
316 if (c) *c = m_colors; 316 if (c) *c = m_colors;
317 if (n) *n = m_num_colors; 317 if (n) *n = m_num_colors;
318} 318}
319 319#endif
320 320
321void ImageControl::getGradientBuffers(unsigned int w, 321void ImageControl::getGradientBuffers(unsigned int w,
322 unsigned int h, 322 unsigned int h,
@@ -373,14 +373,14 @@ void ImageControl::installRootColormap() {
373 XUngrabServer(disp); 373 XUngrabServer(disp);
374} 374}
375 375
376 376#ifdef NOT_USED
377void ImageControl::setColorsPerChannel(int cpc) { 377void ImageControl::setColorsPerChannel(int cpc) {
378 if (cpc < 2) cpc = 2; 378 if (cpc < 2) cpc = 2;
379 if (cpc > 6) cpc = 6; 379 if (cpc > 6) cpc = 6;
380 380
381 m_colors_per_channel = cpc; 381 m_colors_per_channel = cpc;
382} 382}
383 383#endif
384 384
385unsigned long ImageControl::getSqrt(unsigned int x) const { 385unsigned long ImageControl::getSqrt(unsigned int x) const {
386 if (! sqrt_table) { 386 if (! sqrt_table) {
diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh
index 18ad8db..a0f1cc7 100644
--- a/src/FbTk/ImageControl.hh
+++ b/src/FbTk/ImageControl.hh
@@ -70,11 +70,15 @@ public:
70 void removeImage(Pixmap thepix); 70 void removeImage(Pixmap thepix);
71 void colorTables(const unsigned char **, const unsigned char **, const unsigned char **, 71 void colorTables(const unsigned char **, const unsigned char **, const unsigned char **,
72 int *, int *, int *, int *, int *, int *) const; 72 int *, int *, int *, int *, int *, int *) const;
73#ifdef NOT_USED
73 void getXColorTable(XColor **, int *); 74 void getXColorTable(XColor **, int *);
75#endif
74 void getGradientBuffers(unsigned int, unsigned int, 76 void getGradientBuffers(unsigned int, unsigned int,
75 unsigned int **, unsigned int **); 77 unsigned int **, unsigned int **);
76 void setDither(bool d) { m_dither = d; } 78 void setDither(bool d) { m_dither = d; }
79#ifdef NOT_USED
77 void setColorsPerChannel(int cpc); 80 void setColorsPerChannel(int cpc);
81#endif
78 82
79 void cleanCache(); 83 void cleanCache();
80private: 84private:
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 26262f2..4490eb8 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -79,8 +79,10 @@ public:
79 void removeAll(); 79 void removeAll();
80 inline void setInternalMenu(bool val = true) { m_internal_menu = val; } 80 inline void setInternalMenu(bool val = true) { m_internal_menu = val; }
81 inline void setAlignment(Alignment a) { m_alignment = a; } 81 inline void setAlignment(Alignment a) { m_alignment = a; }
82#ifdef NOT_USED
82 inline void setTorn() { m_torn = true; } 83 inline void setTorn() { m_torn = true; }
83 inline void removeParent() { if (m_internal_menu) m_parent = 0; } 84 inline void removeParent() { if (m_internal_menu) m_parent = 0; }
85#endif
84 /// raise this window 86 /// raise this window
85 virtual void raise(); 87 virtual void raise();
86 /// lower this window 88 /// lower this window
@@ -127,7 +129,9 @@ public:
127 /// hide menu 129 /// hide menu
128 virtual void hide(); 130 virtual void hide();
129 virtual void clearWindow(); 131 virtual void clearWindow();
132#ifdef NOT_USED
130 void setActiveIndex(int index) { m_active_index = index; } 133 void setActiveIndex(int index) { m_active_index = index; }
134#endif
131 /*@}*/ 135 /*@}*/
132 136
133 /** 137 /**
diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc
index 26f1c6e..a8b4192 100644
--- a/src/FbTk/SignalHandler.cc
+++ b/src/FbTk/SignalHandler.cc
@@ -62,10 +62,12 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
62 return true; 62 return true;
63} 63}
64 64
65#ifdef NOT_USED
65void SignalHandler::removeHandler(int signum) { 66void SignalHandler::removeHandler(int signum) {
66 if (signum < NSIG) 67 if (signum < NSIG)
67 s_signal_handler[signum] = 0; // clear handler pointer 68 s_signal_handler[signum] = 0; // clear handler pointer
68} 69}
70#endif
69 71
70void SignalHandler::handleSignal(int signum) { 72void SignalHandler::handleSignal(int signum) {
71 if (signum >= NSIG) 73 if (signum >= NSIG)
diff --git a/src/FbTk/SignalHandler.hh b/src/FbTk/SignalHandler.hh
index 7b013cf..1f3af4a 100644
--- a/src/FbTk/SignalHandler.hh
+++ b/src/FbTk/SignalHandler.hh
@@ -54,11 +54,13 @@ public:
54 @param oldhandler_ret return handler to old sighandler 54 @param oldhandler_ret return handler to old sighandler
55 */ 55 */
56 bool registerHandler(int signum, SignalEventHandler *eh, SignalEventHandler **oldhandler_ret = 0); 56 bool registerHandler(int signum, SignalEventHandler *eh, SignalEventHandler **oldhandler_ret = 0);
57#ifdef NOT_USED
57 /** 58 /**
58 removes the signum handler 59 removes the signum handler
59 @param signum signal number 60 @param signum signal number
60 */ 61 */
61 void removeHandler(int signum); 62 void removeHandler(int signum);
63#endif
62private: 64private:
63 SignalHandler(); 65 SignalHandler();
64 66
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 474c094..948f847 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -98,12 +98,14 @@ void TextButton::setFont(FbTk::Font &font) {
98 font.validOrientation(m_orientation); // load the orientation! 98 font.validOrientation(m_orientation); // load the orientation!
99} 99}
100 100
101#ifdef NOT_USED
101/// set bevel and redraw text 102/// set bevel and redraw text
102void TextButton::setBevel(int bevel) { 103void TextButton::setBevel(int bevel) {
103 if (m_bevel == bevel) 104 if (m_bevel == bevel)
104 return; 105 return;
105 m_bevel = bevel; 106 m_bevel = bevel;
106} 107}
108#endif
107 109
108void TextButton::setTextPaddingLeft(unsigned int leftpadding) { 110void TextButton::setTextPaddingLeft(unsigned int leftpadding) {
109 m_left_padding = leftpadding; 111 m_left_padding = leftpadding;
diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh
index c9f3fbf..26a2469 100644
--- a/src/FbTk/TextButton.hh
+++ b/src/FbTk/TextButton.hh
@@ -44,7 +44,9 @@ public:
44 bool setOrientation(FbTk::Orientation orient); 44 bool setOrientation(FbTk::Orientation orient);
45 void setText(const std::string &text); 45 void setText(const std::string &text);
46 void setFont(FbTk::Font &font); 46 void setFont(FbTk::Font &font);
47#ifdef NOT_USED
47 void setBevel(int bevel); 48 void setBevel(int bevel);
49#endif
48 void setTextPadding(unsigned int padding); 50 void setTextPadding(unsigned int padding);
49 void setTextPaddingLeft(unsigned int leftpadding); 51 void setTextPaddingLeft(unsigned int leftpadding);
50 void setTextPaddingRight(unsigned int rightpadding); 52 void setTextPaddingRight(unsigned int rightpadding);
diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh
index 14b5547..7f796b7 100644
--- a/src/FbTk/TextureRender.hh
+++ b/src/FbTk/TextureRender.hh
@@ -84,7 +84,6 @@ private:
84 void cdgradient(); 84 void cdgradient();
85 void pcgradient(); 85 void pcgradient();
86 //@} 86 //@}
87 void makeGradientBuffers();
88 87
89 ImageControl &control; 88 ImageControl &control;
90 bool interlaced; 89 bool interlaced;