diff options
-rw-r--r-- | src/FbTk/FbDrawable.hh | 1 | ||||
-rw-r--r-- | src/FbTk/FbWindow.cc | 6 | ||||
-rw-r--r-- | src/FbTk/FbWindow.hh | 10 | ||||
-rw-r--r-- | src/FbTk/MenuItem.cc | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh index 8d91377..32f5c53 100644 --- a/src/FbTk/FbDrawable.hh +++ b/src/FbTk/FbDrawable.hh | |||
@@ -72,6 +72,7 @@ public: | |||
72 | virtual Drawable drawable() const = 0; | 72 | virtual Drawable drawable() const = 0; |
73 | virtual unsigned int width() const = 0; | 73 | virtual unsigned int width() const = 0; |
74 | virtual unsigned int height() const = 0; | 74 | virtual unsigned int height() const = 0; |
75 | virtual unsigned int depth() const = 0; | ||
75 | static inline Display *display() { return s_display; } | 76 | static inline Display *display() { return s_display; } |
76 | protected: | 77 | protected: |
77 | static Display *s_display; // display connection // display connection | 78 | static Display *s_display; // display connection // display connection |
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index f8141cf..12492d9 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -69,7 +69,7 @@ FbWindow::FbWindow(int screen_num, | |||
69 | long eventmask, | 69 | long eventmask, |
70 | bool override_redirect, | 70 | bool override_redirect, |
71 | bool save_unders, | 71 | bool save_unders, |
72 | int depth, | 72 | unsigned int depth, |
73 | int class_type): | 73 | int class_type): |
74 | FbDrawable(), | 74 | FbDrawable(), |
75 | m_parent(0), | 75 | m_parent(0), |
@@ -89,7 +89,7 @@ FbWindow::FbWindow(const FbWindow &parent, | |||
89 | long eventmask, | 89 | long eventmask, |
90 | bool override_redirect, | 90 | bool override_redirect, |
91 | bool save_unders, | 91 | bool save_unders, |
92 | int depth, int class_type): | 92 | unsigned int depth, int class_type): |
93 | m_parent(&parent), | 93 | m_parent(&parent), |
94 | m_screen_num(parent.screenNumber()), | 94 | m_screen_num(parent.screenNumber()), |
95 | m_destroy(true), | 95 | m_destroy(true), |
@@ -599,7 +599,7 @@ void FbWindow::updateGeometry() { | |||
599 | void FbWindow::create(Window parent, int x, int y, | 599 | void FbWindow::create(Window parent, int x, int y, |
600 | unsigned int width, unsigned int height, | 600 | unsigned int width, unsigned int height, |
601 | long eventmask, bool override_redirect, | 601 | long eventmask, bool override_redirect, |
602 | bool save_unders, int depth, int class_type) { | 602 | bool save_unders, unsigned int depth, int class_type) { |
603 | 603 | ||
604 | 604 | ||
605 | m_border_width = 0; | 605 | m_border_width = 0; |
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh index 091fb48..b69dfd7 100644 --- a/src/FbTk/FbWindow.hh +++ b/src/FbTk/FbWindow.hh | |||
@@ -58,7 +58,7 @@ public: | |||
58 | int x, int y, unsigned int width, unsigned int height, long eventmask, | 58 | int x, int y, unsigned int width, unsigned int height, long eventmask, |
59 | bool overrride_redirect = false, | 59 | bool overrride_redirect = false, |
60 | bool save_unders = false, | 60 | bool save_unders = false, |
61 | int depth = CopyFromParent, | 61 | unsigned int depth = CopyFromParent, |
62 | int class_type = InputOutput); | 62 | int class_type = InputOutput); |
63 | 63 | ||
64 | FbWindow(const FbWindow &parent, | 64 | FbWindow(const FbWindow &parent, |
@@ -67,7 +67,7 @@ public: | |||
67 | long eventmask, | 67 | long eventmask, |
68 | bool overrride_redirect = false, | 68 | bool overrride_redirect = false, |
69 | bool save_unders = false, | 69 | bool save_unders = false, |
70 | int depth = CopyFromParent, | 70 | unsigned int depth = CopyFromParent, |
71 | int class_type = InputOutput); | 71 | int class_type = InputOutput); |
72 | 72 | ||
73 | virtual ~FbWindow(); | 73 | virtual ~FbWindow(); |
@@ -179,7 +179,7 @@ public: | |||
179 | inline unsigned int width() const { return m_width; } | 179 | inline unsigned int width() const { return m_width; } |
180 | inline unsigned int height() const { return m_height; } | 180 | inline unsigned int height() const { return m_height; } |
181 | inline unsigned int borderWidth() const { return m_border_width; } | 181 | inline unsigned int borderWidth() const { return m_border_width; } |
182 | inline int depth() const { return m_depth; } | 182 | inline unsigned int depth() const { return m_depth; } |
183 | unsigned char alpha() const; | 183 | unsigned char alpha() const; |
184 | int screenNumber() const; | 184 | int screenNumber() const; |
185 | long eventMask() const; | 185 | long eventMask() const; |
@@ -218,7 +218,7 @@ private: | |||
218 | long eventmask, | 218 | long eventmask, |
219 | bool override_redirect, | 219 | bool override_redirect, |
220 | bool save_unders, | 220 | bool save_unders, |
221 | int depth, | 221 | unsigned int depth, |
222 | int class_type); | 222 | int class_type); |
223 | 223 | ||
224 | const FbWindow *m_parent; ///< parent FbWindow | 224 | const FbWindow *m_parent; ///< parent FbWindow |
@@ -227,7 +227,7 @@ private: | |||
227 | int m_x, m_y; ///< position of window | 227 | int m_x, m_y; ///< position of window |
228 | unsigned int m_width, m_height; ///< size of window | 228 | unsigned int m_width, m_height; ///< size of window |
229 | unsigned int m_border_width; ///< border size | 229 | unsigned int m_border_width; ///< border size |
230 | int m_depth; ///< bit depth | 230 | unsigned int m_depth; ///< bit depth |
231 | bool m_destroy; ///< wheter the x window was created before | 231 | bool m_destroy; ///< wheter the x window was created before |
232 | std::auto_ptr<FbTk::Transparent> m_transparent; | 232 | std::auto_ptr<FbTk::Transparent> m_transparent; |
233 | bool m_lastbg_color_set; | 233 | bool m_lastbg_color_set; |
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc index 1e708d3..0e99192 100644 --- a/src/FbTk/MenuItem.cc +++ b/src/FbTk/MenuItem.cc | |||
@@ -114,7 +114,7 @@ void MenuItem::draw(FbDrawable &draw, | |||
114 | int icon_x = x + theme.bevelWidth(); | 114 | int icon_x = x + theme.bevelWidth(); |
115 | int icon_y = y + theme.bevelWidth(); | 115 | int icon_y = y + theme.bevelWidth(); |
116 | // enable clip mask | 116 | // enable clip mask |
117 | XSetClipMask(disp, gc, tmp_mask.drawable()); | 117 | XSetClipMask(disp, gc, None); //tmp_mask.drawable()); |
118 | XSetClipOrigin(disp, gc, icon_x, icon_y); | 118 | XSetClipOrigin(disp, gc, icon_x, icon_y); |
119 | 119 | ||
120 | draw.copyArea(tmp_pixmap.drawable(), | 120 | draw.copyArea(tmp_pixmap.drawable(), |