diff options
author | fluxgen <fluxgen> | 2001-12-29 10:39:04 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2001-12-29 10:39:04 (GMT) |
commit | a75bfa59d256fe4fa6e68665e00fe3ade08c04f7 (patch) | |
tree | 5a53f4c98ee9dc7ba756d0bfc30a854d7e8733d8 | |
parent | ccd408d988f097012c3b2e7d72b5ab71e6e62055 (diff) | |
download | fluxbox-a75bfa59d256fe4fa6e68665e00fe3ade08c04f7.zip fluxbox-a75bfa59d256fe4fa6e68665e00fe3ade08c04f7.tar.bz2 |
Updated texture constants
-rw-r--r-- | src/IconBar.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc index ea0ba6f..f5ec382 100644 --- a/src/IconBar.cc +++ b/src/IconBar.cc | |||
@@ -22,11 +22,10 @@ | |||
22 | #include "IconBar.hh" | 22 | #include "IconBar.hh" |
23 | #include "i18n.hh" | 23 | #include "i18n.hh" |
24 | 24 | ||
25 | IconBarObj::IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin): | 25 | IconBarObj::IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin) |
26 | m_fluxboxwin(fluxboxwin), | ||
27 | m_iconwin(iconwin) | ||
28 | { | 26 | { |
29 | 27 | m_fluxboxwin = fluxboxwin; | |
28 | m_iconwin = iconwin; | ||
30 | } | 29 | } |
31 | 30 | ||
32 | IconBarObj::~IconBarObj() { | 31 | IconBarObj::~IconBarObj() { |
@@ -93,10 +92,10 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) { | |||
93 | Pixmap tmp = m_focus_pm; | 92 | Pixmap tmp = m_focus_pm; |
94 | BTexture *texture = &(m_screen->getWindowStyle()->tab.l_focus); | 93 | BTexture *texture = &(m_screen->getWindowStyle()->tab.l_focus); |
95 | 94 | ||
96 | if (texture->getTexture() & BImage_ParentRelative ) { | 95 | if (texture->getTexture() & BImage::PARENTRELATIVE ) { |
97 | 96 | ||
98 | BTexture *pt = &(m_screen->getWindowStyle()->tab.t_focus); | 97 | BTexture *pt = &(m_screen->getWindowStyle()->tab.t_focus); |
99 | if (pt->getTexture() == (BImage_Flat | BImage_Solid)) { | 98 | if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
100 | m_focus_pm = None; | 99 | m_focus_pm = None; |
101 | m_focus_pixel = pt->getColor()->getPixel(); | 100 | m_focus_pixel = pt->getColor()->getPixel(); |
102 | } else | 101 | } else |
@@ -105,7 +104,7 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) { | |||
105 | 104 | ||
106 | } else { | 105 | } else { |
107 | 106 | ||
108 | if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { | 107 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
109 | m_focus_pm = None; | 108 | m_focus_pm = None; |
110 | m_focus_pixel = texture->getColor()->getPixel(); | 109 | m_focus_pixel = texture->getColor()->getPixel(); |
111 | } else | 110 | } else |