diff options
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 39c7f6d..349f1ea 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Toolbar.cc,v 1.75 2003/04/25 16:08:45 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.76 2003/04/27 04:28:03 rathnor Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -293,11 +293,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi | |||
293 | frame.base = frame.label = frame.wlabel = frame.clk = frame.button = | 293 | frame.base = frame.label = frame.wlabel = frame.clk = frame.button = |
294 | frame.pbutton = None; | 294 | frame.pbutton = None; |
295 | 295 | ||
296 | //DEL/fix -> remove useIconBar resource | ||
297 | // if (Fluxbox::instance()->useIconBar()) | ||
298 | m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); | 296 | m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); |
299 | 297 | ||
300 | |||
301 | XMapSubwindows(display, frame.window.window()); | 298 | XMapSubwindows(display, frame.window.window()); |
302 | frame.window.show(); | 299 | frame.window.show(); |
303 | 300 | ||
@@ -370,17 +367,16 @@ bool Toolbar::containsIcon(FluxboxWindow &win) { | |||
370 | } | 367 | } |
371 | 368 | ||
372 | void Toolbar::enableIconBar() { | 369 | void Toolbar::enableIconBar() { |
373 | // already on | ||
374 | if (m_iconbar.get() != 0) | 370 | if (m_iconbar.get() != 0) |
375 | return; | 371 | return; // already on |
372 | |||
376 | m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); | 373 | m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); |
377 | } | 374 | } |
378 | 375 | ||
379 | void Toolbar::disableIconBar() { | 376 | void Toolbar::disableIconBar() { |
380 | // already off | ||
381 | if (m_iconbar.get() == 0) | 377 | if (m_iconbar.get() == 0) |
382 | return; | 378 | return; // already off |
383 | 379 | ||
384 | delAllIcons(); | 380 | delAllIcons(); |
385 | 381 | ||
386 | m_iconbar.reset(0); // destroy iconbar | 382 | m_iconbar.reset(0); // destroy iconbar |