aboutsummaryrefslogtreecommitdiff
path: root/src/Tab.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Tab.cc')
-rw-r--r--src/Tab.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Tab.cc b/src/Tab.cc
index a38542b..efa5652 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.cc,v 1.27 2002/05/19 15:37:29 fluxgen Exp $ 22// $Id: Tab.cc,v 1.28 2002/07/20 09:49:21 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -97,8 +97,8 @@ void Tab::createTabWindow() {
97 XSetWindowAttributes attrib; 97 XSetWindowAttributes attrib;
98 attrib.background_pixmap = None; 98 attrib.background_pixmap = None;
99 attrib.background_pixel = attrib.border_pixel = 99 attrib.background_pixel = attrib.border_pixel =
100 m_win->getScreen()->getWindowStyle()->tab.border_color.getPixel(); 100 m_win->getScreen()->getWindowStyle()->tab.border_color.pixel();
101 attrib.colormap = m_win->getScreen()->getColormap(); 101 attrib.colormap = m_win->getScreen()->colormap();
102 attrib.override_redirect = True; 102 attrib.override_redirect = True;
103 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | 103 attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
104 ButtonMotionMask | ExposureMask | EnterWindowMask; 104 ButtonMotionMask | ExposureMask | EnterWindowMask;
@@ -195,7 +195,7 @@ void Tab::loadTheme() {
195 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus); 195 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus);
196 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { 196 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
197 m_focus_pm = None; 197 m_focus_pm = None;
198 m_focus_pixel = pt->getColor()->getPixel(); 198 m_focus_pixel = pt->color().pixel();
199 } else 199 } else
200 m_focus_pm = 200 m_focus_pm =
201 image_ctrl->renderImage(m_size_w, m_size_h, pt); 201 image_ctrl->renderImage(m_size_w, m_size_h, pt);
@@ -205,7 +205,7 @@ void Tab::loadTheme() {
205 } else { 205 } else {
206 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 206 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
207 m_focus_pm = None; 207 m_focus_pm = None;
208 m_focus_pixel = texture->getColor()->getPixel(); 208 m_focus_pixel = texture->color().pixel();
209 } else 209 } else
210 m_focus_pm = 210 m_focus_pm =
211 image_ctrl->renderImage(m_size_w, m_size_h, texture); 211 image_ctrl->renderImage(m_size_w, m_size_h, texture);
@@ -219,14 +219,14 @@ void Tab::loadTheme() {
219 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus); 219 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus);
220 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { 220 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
221 m_unfocus_pm = None; 221 m_unfocus_pm = None;
222 m_unfocus_pixel = pt->getColor()->getPixel(); 222 m_unfocus_pixel = pt->color().pixel();
223 } else 223 } else
224 m_unfocus_pm = 224 m_unfocus_pm =
225 image_ctrl->renderImage(m_size_w, m_size_h, pt); 225 image_ctrl->renderImage(m_size_w, m_size_h, pt);
226 } else { 226 } else {
227 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 227 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
228 m_unfocus_pm = None; 228 m_unfocus_pm = None;
229 m_unfocus_pixel = texture->getColor()->getPixel(); 229 m_unfocus_pixel = texture->color().pixel();
230 } else 230 } else
231 m_unfocus_pm = 231 m_unfocus_pm =
232 image_ctrl->renderImage(m_size_w, m_size_h, texture); 232 image_ctrl->renderImage(m_size_w, m_size_h, texture);
@@ -244,7 +244,7 @@ void Tab::decorate() {
244 XSetWindowBorderWidth(m_display, m_tabwin, 244 XSetWindowBorderWidth(m_display, m_tabwin,
245 m_win->getScreen()->getWindowStyle()->tab.border_width); 245 m_win->getScreen()->getWindowStyle()->tab.border_width);
246 XSetWindowBorder(m_display, m_tabwin, 246 XSetWindowBorder(m_display, m_tabwin,
247 m_win->getScreen()->getWindowStyle()->tab.border_color.getPixel()); 247 m_win->getScreen()->getWindowStyle()->tab.border_color.pixel());
248} 248}
249 249
250//-------------- deiconify ----------------- 250//-------------- deiconify -----------------