aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 3053c09..52c707a 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.82 2003/05/15 12:00:45 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.83 2003/05/15 23:30:03 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -256,10 +256,10 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
256 m_hide_timer(&hide_handler), 256 m_hide_timer(&hide_handler),
257 m_toolbarmenu(menu), 257 m_toolbarmenu(menu),
258 m_placementmenu(*scrn.menuTheme(), 258 m_placementmenu(*scrn.menuTheme(),
259 scrn.screenNumber(), *scrn.getImageControl()), 259 scrn.screenNumber(), scrn.imageControl()),
260 m_layermenu(*scrn.menuTheme(), 260 m_layermenu(*scrn.menuTheme(),
261 scrn.screenNumber(), 261 scrn.screenNumber(),
262 *scrn.getImageControl(), 262 scrn.imageControl(),
263 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 263 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
264 this, 264 this,
265 true), 265 true),
@@ -325,7 +325,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
325 325
326 326
327Toolbar::~Toolbar() { 327Toolbar::~Toolbar() {
328 FbTk::ImageControl &image_ctrl = *screen().getImageControl(); 328 FbTk::ImageControl &image_ctrl = screen().imageControl();
329 if (frame.base) image_ctrl.removeImage(frame.base); 329 if (frame.base) image_ctrl.removeImage(frame.base);
330 if (frame.label) image_ctrl.removeImage(frame.label); 330 if (frame.label) image_ctrl.removeImage(frame.label);
331 if (frame.wlabel) image_ctrl.removeImage(frame.wlabel); 331 if (frame.wlabel) image_ctrl.removeImage(frame.wlabel);
@@ -568,7 +568,7 @@ void Toolbar::reconfigure() {
568 frame.clock.moveResize(next_x + text_x, next_y + text_y, 568 frame.clock.moveResize(next_x + text_x, next_y + text_y,
569 clock_w, clock_h); 569 clock_w, clock_h);
570 570
571 FbTk::ImageControl &image_ctrl = *screen().getImageControl(); 571 FbTk::ImageControl &image_ctrl = screen().imageControl();
572 572
573 Pixmap tmp = frame.base; 573 Pixmap tmp = frame.base;
574 const FbTk::Texture *texture = &(m_theme.toolbar()); 574 const FbTk::Texture *texture = &(m_theme.toolbar());