aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-02-07 15:12:23 (GMT)
committerfluxgen <fluxgen>2002-02-07 15:12:23 (GMT)
commitaa25d549c03ee1569b2b9fa1198fb0d0de090ff1 (patch)
tree8bc3a2f242db102b6d1e27712569ca8e60d69507 /src
parent70d19916716430fe0bfaab8a6b59064622f33302 (diff)
downloadfluxbox-aa25d549c03ee1569b2b9fa1198fb0d0de090ff1.zip
fluxbox-aa25d549c03ee1569b2b9fa1198fb0d0de090ff1.tar.bz2
minor update
Diffstat (limited to 'src')
-rw-r--r--src/Toolbar.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 2415506..17741b1 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -19,6 +19,8 @@
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: Toolbar.cc,v 1.11 2002/02/07 15:12:23 fluxgen Exp $
23
22// stupid macros needed to access some functions in version 2 of the GNU C 24// stupid macros needed to access some functions in version 2 of the GNU C
23// library 25// library
24#ifndef _GNU_SOURCE 26#ifndef _GNU_SOURCE
@@ -68,7 +70,8 @@ using namespace std;
68 70
69Toolbar::Toolbar(BScreen *scrn): 71Toolbar::Toolbar(BScreen *scrn):
70screen(scrn), 72screen(scrn),
71image_ctrl(screen->getImageControl()) 73image_ctrl(screen->getImageControl()),
74iconbar(0)
72{ 75{
73 76
74 fluxbox = Fluxbox::instance(); 77 fluxbox = Fluxbox::instance();
@@ -154,15 +157,17 @@ image_ctrl(screen->getImageControl())
154 frame.base = frame.label = frame.wlabel = frame.clk = frame.button = 157 frame.base = frame.label = frame.wlabel = frame.clk = frame.button =
155 frame.pbutton = None; 158 frame.pbutton = None;
156 159
160
157 if (Fluxbox::instance()->useIconBar()) 161 if (Fluxbox::instance()->useIconBar())
158 iconbar = new IconBar(screen, frame.window_label); 162 iconbar = new IconBar(screen, frame.window_label);
159 else 163 else
160 iconbar = 0; 164 iconbar = 0;
161
162 reconfigure();
163 165
164 XMapSubwindows(display, frame.window); 166 XMapSubwindows(display, frame.window);
165 XMapWindow(display, frame.window); 167 XMapWindow(display, frame.window);
168
169 reconfigure();
170
166} 171}
167 172
168 173