diff options
author | fluxgen <fluxgen> | 2002-07-20 00:06:45 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-07-20 00:06:45 (GMT) |
commit | 5c4fe96fc1973a02d6180330da449205fac2ef9b (patch) | |
tree | 948dad3f0eebc0ae375de87596de82072d3f7d48 | |
parent | 3b0b45af36402e631a7ce584e554fe0b16660efc (diff) | |
download | fluxbox_paul-5c4fe96fc1973a02d6180330da449205fac2ef9b.zip fluxbox_paul-5c4fe96fc1973a02d6180330da449205fac2ef9b.tar.bz2 |
minor update
-rw-r--r-- | src/IconBar.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc index 0377d3b..a5b2c90 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.12 2002/04/03 23:01:49 fluxgen Exp $ | 22 | // $Id: IconBar.cc,v 1.13 2002/07/20 00:06:45 fluxgen Exp $ |
23 | 23 | ||
24 | #include "IconBar.hh" | 24 | #include "IconBar.hh" |
25 | #include "i18n.hh" | 25 | #include "i18n.hh" |
@@ -106,7 +106,7 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) { | |||
106 | 106 | ||
107 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 107 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
108 | m_focus_pm = None; | 108 | m_focus_pm = None; |
109 | m_focus_pixel = texture->getColor()->getPixel(); | 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); |
@@ -122,7 +122,7 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) { | |||
122 | void IconBar::decorate(Window win) { | 122 | void IconBar::decorate(Window win) { |
123 | 123 | ||
124 | XSetWindowBorderWidth(m_display, win, m_screen->getWindowStyle()->tab.border_width); | 124 | XSetWindowBorderWidth(m_display, win, m_screen->getWindowStyle()->tab.border_width); |
125 | XSetWindowBorder(m_display, win, m_screen->getWindowStyle()->tab.border_color.getPixel()); | 125 | XSetWindowBorder(m_display, win, m_screen->getWindowStyle()->tab.border_color.pixel()); |
126 | if (m_focus_pm) | 126 | if (m_focus_pm) |
127 | XSetWindowBackgroundPixmap(m_display, win, m_focus_pm); | 127 | XSetWindowBackgroundPixmap(m_display, win, m_focus_pm); |
128 | else | 128 | else |
@@ -216,8 +216,8 @@ Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) { | |||
216 | XSetWindowAttributes attrib; | 216 | XSetWindowAttributes attrib; |
217 | attrib.background_pixmap = None; | 217 | attrib.background_pixmap = None; |
218 | attrib.background_pixel = attrib.border_pixel = | 218 | attrib.background_pixel = attrib.border_pixel = |
219 | fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.getPixel(); | 219 | fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.pixel(); |
220 | attrib.colormap = fluxboxwin->getScreen()->getColormap(); | 220 | attrib.colormap = fluxboxwin->getScreen()->colormap(); |
221 | attrib.override_redirect = True; | 221 | attrib.override_redirect = True; |
222 | attrib.event_mask = ButtonPressMask | ButtonReleaseMask | | 222 | attrib.event_mask = ButtonPressMask | ButtonReleaseMask | |
223 | ButtonMotionMask | ExposureMask | EnterWindowMask; | 223 | ButtonMotionMask | ExposureMask | EnterWindowMask; |