aboutsummaryrefslogtreecommitdiff
path: root/src/IconBar.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-14 15:01:55 (GMT)
committerfluxgen <fluxgen>2003-04-14 15:01:55 (GMT)
commit2928b32f3a399527113325de3db39cd75db4ee8e (patch)
tree53c9d8e3676e35a200314df700344ef2711fb7b4 /src/IconBar.cc
parentb6ca956c821e1e968dda10ee7852c6933b549b08 (diff)
downloadfluxbox_pavel-2928b32f3a399527113325de3db39cd75db4ee8e.zip
fluxbox_pavel-2928b32f3a399527113325de3db39cd75db4ee8e.tar.bz2
merged with embedded-tab-branch
Diffstat (limited to 'src/IconBar.cc')
-rw-r--r--src/IconBar.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc
index e549e79..d4a3748 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -13,13 +13,13 @@
13// 13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
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.28 2003/04/09 17:20:02 rathnor Exp $ 22// $Id: IconBar.cc,v 1.29 2003/04/14 14:44:17 fluxgen Exp $
23 23
24#include "IconBar.hh" 24#include "IconBar.hh"
25 25
@@ -287,15 +287,15 @@ Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) {
287 XSetWindowAttributes attrib; 287 XSetWindowAttributes attrib;
288 attrib.background_pixmap = None; 288 attrib.background_pixmap = None;
289 attrib.background_pixel = attrib.border_pixel = 289 attrib.background_pixel = attrib.border_pixel =
290 fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.pixel(); 290 fluxboxwin->getScreen().getWindowStyle()->tab.border_color.pixel();
291 attrib.colormap = fluxboxwin->getScreen()->colormap(); 291 attrib.colormap = fluxboxwin->getScreen().colormap();
292 attrib.override_redirect = True; 292 attrib.override_redirect = True;
293 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | 293 attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
294 ButtonMotionMask | ExposureMask | EnterWindowMask; 294 ButtonMotionMask | ExposureMask | EnterWindowMask;
295 295
296 //create iconwindow 296 //create iconwindow
297 Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0, 297 Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0,
298 fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(), 298 fluxboxwin->getScreen().getDepth(), InputOutput, fluxboxwin->getScreen().getVisual(),
299 attrib_mask, &attrib); 299 attrib_mask, &attrib);
300 300
301 return iconwin; 301 return iconwin;