aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-10 00:35:19 (GMT)
committerfluxgen <fluxgen>2003-01-10 00:35:19 (GMT)
commit7e8796c31ecea07484bda1d824f95babb1e1241c (patch)
tree6adaac716b9081df40becf812819a15cd1dab27f /src
parentd879cbae7f5ced020b68c680ff02d02db09b8faf (diff)
downloadfluxbox-7e8796c31ecea07484bda1d824f95babb1e1241c.zip
fluxbox-7e8796c31ecea07484bda1d824f95babb1e1241c.tar.bz2
adjusted for FbTk ImageControl
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Screen.hh7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c1543d7..fa311cd 100644
--- a/src/Screen.cc
+++ b/src/Screen.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: Screen.cc,v 1.95 2003/01/09 17:41:02 fluxgen Exp $ 25// $Id: Screen.cc,v 1.96 2003/01/10 00:35:19 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -351,7 +351,7 @@ BScreen::BScreen(ResourceManager &rm,
351 XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor()); 351 XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor());
352 352
353 image_control = 353 image_control =
354 new BImageControl(scrn, true, fluxbox->colorsPerChannel(), 354 new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(),
355 fluxbox->getCacheLife(), fluxbox->getCacheMax()); 355 fluxbox->getCacheLife(), fluxbox->getCacheMax());
356 image_control->installRootColormap(); 356 image_control->installRootColormap();
357 root_colormap_installed = true; 357 root_colormap_installed = true;
diff --git a/src/Screen.hh b/src/Screen.hh
index f080db4..0002e0d 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -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: Screen.hh,v 1.59 2003/01/09 17:38:40 fluxgen Exp $ 25// $Id: Screen.hh,v 1.60 2003/01/10 00:34:08 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -57,6 +57,7 @@ class Slit;
57namespace FbTk { 57namespace FbTk {
58class MenuTheme; 58class MenuTheme;
59class Menu; 59class Menu;
60class ImageControl;
60}; 61};
61 62
62/// Handles screen connection and screen clients 63/// Handles screen connection and screen clients
@@ -95,7 +96,7 @@ public:
95 inline GC getOpGC() const { return theme->getOpGC(); } 96 inline GC getOpGC() const { return theme->getOpGC(); }
96 97
97 inline const FbTk::Color *getBorderColor() const { return &theme->getBorderColor(); } 98 inline const FbTk::Color *getBorderColor() const { return &theme->getBorderColor(); }
98 inline BImageControl *getImageControl() { return image_control; } 99 inline FbTk::ImageControl *getImageControl() { return image_control; }
99 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); } 100 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); }
100 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); } 101 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); }
101 102
@@ -331,7 +332,7 @@ private:
331 Pixmap geom_pixmap; 332 Pixmap geom_pixmap;
332 Window geom_window; 333 Window geom_window;
333 334
334 BImageControl *image_control; 335 FbTk::ImageControl *image_control;
335 Configmenu *configmenu; 336 Configmenu *configmenu;
336 337
337 std::auto_ptr<FbTk::Menu> m_rootmenu; 338 std::auto_ptr<FbTk::Menu> m_rootmenu;