M src/Screen.cc → src/Screen.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.95 2003/01/09 17:41:02 fluxgen Exp $
+// $Id: Screen.cc,v 1.96 2003/01/10 00:35:19 fluxgen Exp $
 
 
 #include "Screen.hh"
@@ -351,7 +351,7 @@ 
     XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor());
 
     image_control =
-        new BImageControl(scrn, true, fluxbox->colorsPerChannel(),
+        new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(),
                           fluxbox->getCacheLife(), fluxbox->getCacheMax());
     image_control->installRootColormap();
     root_colormap_installed = true;

M src/Screen.hh → src/Screen.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.hh,v 1.59 2003/01/09 17:38:40 fluxgen Exp $
+// $Id: Screen.hh,v 1.60 2003/01/10 00:34:08 fluxgen Exp $
 
 #ifndef	 SCREEN_HH
 #define	 SCREEN_HH
@@ -57,6 +57,7 @@ 
 namespace FbTk {
 class MenuTheme;
 class Menu;
+class ImageControl;
 };
 
 /// Handles screen connection and screen clients
@@ -95,7 +96,7 @@ bool antialias() const { return *resource.antialias; }
     inline GC getOpGC() const { return theme->getOpGC(); }
 	
     inline const FbTk::Color *getBorderColor() const { return &theme->getBorderColor(); }
-    inline BImageControl *getImageControl() { return image_control; }
+    inline FbTk::ImageControl *getImageControl() { return image_control; }
     const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); }
     FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); }
 	
@@ -331,7 +332,7 @@ GC opGC;
     Pixmap geom_pixmap;
     Window geom_window;
 
-    BImageControl *image_control;
+    FbTk::ImageControl *image_control;
     Configmenu *configmenu;
 
     std::auto_ptr<FbTk::Menu> m_rootmenu;