diff options
Diffstat (limited to 'src/IconBar.cc')
-rw-r--r-- | src/IconBar.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc index a5b2c90..c9eb55f 100644 --- a/src/IconBar.cc +++ b/src/IconBar.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: IconBar.cc,v 1.13 2002/07/20 00:06:45 fluxgen Exp $ | 22 | // $Id: IconBar.cc,v 1.14 2002/07/23 17:11:58 fluxgen Exp $ |
23 | 23 | ||
24 | #include "IconBar.hh" | 24 | #include "IconBar.hh" |
25 | #include "i18n.hh" | 25 | #include "i18n.hh" |
@@ -97,22 +97,23 @@ Window IconBar::delIcon(FluxboxWindow *fluxboxwin) { | |||
97 | void IconBar::loadTheme(unsigned int width, unsigned int height) { | 97 | void IconBar::loadTheme(unsigned int width, unsigned int height) { |
98 | BImageControl *image_ctrl = m_screen->getImageControl(); | 98 | BImageControl *image_ctrl = m_screen->getImageControl(); |
99 | Pixmap tmp = m_focus_pm; | 99 | Pixmap tmp = m_focus_pm; |
100 | BTexture *texture = &(m_screen->getWindowStyle()->tab.l_focus); | 100 | FbTk::Texture *texture = &(m_screen->getWindowStyle()->tab.l_focus); |
101 | 101 | ||
102 | //If we are working on a PARENTRELATIVE, change to right focus value | 102 | //If we are working on a PARENTRELATIVE, change to right focus value |
103 | if (texture->getTexture() & BImage::PARENTRELATIVE ) { | 103 | if (texture->type() & FbTk::Texture::PARENTRELATIVE ) { |
104 | texture = &(m_screen->getWindowStyle()->tab.t_focus); | 104 | texture = &(m_screen->getWindowStyle()->tab.t_focus); |
105 | } | 105 | } |
106 | 106 | ||
107 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 107 | if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { |
108 | m_focus_pm = None; | 108 | m_focus_pm = None; |
109 | m_focus_pixel = texture->color().pixel(); | 109 | m_focus_pixel = texture->color().pixel(); |
110 | } else { | 110 | } else { |
111 | m_focus_pm = | 111 | m_focus_pm = |
112 | image_ctrl->renderImage(width, height, texture); | 112 | image_ctrl->renderImage(width, height, texture); |
113 | } | 113 | } |
114 | 114 | ||
115 | if (tmp) image_ctrl->removeImage(tmp); | 115 | if (tmp) |
116 | image_ctrl->removeImage(tmp); | ||
116 | } | 117 | } |
117 | 118 | ||
118 | //------------ decorate ------------------ | 119 | //------------ decorate ------------------ |