adjusted for FbTk ImageControl

5 files changed, 16 insertions, 15 deletions

diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index ac11a25..200c0bd 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrame.cc,v 1.3 2003/01/09 18:03:33 fluxgen Exp $
+// $Id: FbWinFrame.cc,v 1.4 2003/01/09 22:01:30 fluxgen Exp $
 
 #include "FbWinFrame.hh"
 #include "ImageControl.hh"
@@ -29,7 +29,7 @@
 #include <iostream>
 using namespace std;
 
-FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, int screen_num, int x, int y,
+FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, int screen_num, int x, int y,
                        unsigned int width, unsigned int height):
     m_theme(theme),
     m_imagectrl(imgctrl),
@@ -67,7 +67,7 @@ FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, int scree
     init();
 }
 /*
-  FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, const FbTk::FbWindow &parent, int x, int y,
+  FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, const FbTk::FbWindow &parent, int x, int y,
   unsigned int width, unsigned int height):
   m_theme(theme),
   m_imagectrl(imgctrl),
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index ba553cc..2f5b81b 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrame.hh,v 1.2 2003/01/07 01:28:16 fluxgen Exp $
+// $Id: FbWinFrame.hh,v 1.3 2003/01/09 22:00:34 fluxgen Exp $
 
 #ifndef FBWINFRAME_HH
 #define FBWINFRAME_HH
@@ -36,20 +36,21 @@
 #include <vector>
 #include <string>
 
-
 class FbWinFrameTheme;
-class BImageControl;
+namespace FbTk {
+class ImageControl;
+};
 
 /// holds a window frame with a client window (see: <a href="fluxbox_fbwinframe.png">image</a>)
 class FbWinFrame:public FbTk::EventHandler {
 public:
 
     /// create a top level window
-    FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, int screen_num, int x, int y,
+    FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, int screen_num, int x, int y,
                unsigned int width, unsigned int height);
 
     /// create a frame window inside another FbWindow, NOT IMPLEMENTED!
-    FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, const FbTk::FbWindow &parent,
+    FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, const FbTk::FbWindow &parent,
                int x, int y, 
                unsigned int width, unsigned int height);
 
@@ -170,7 +171,7 @@ private:
     void setupButton(FbTk::Button &btn);
 
     FbWinFrameTheme &m_theme; ///< theme to be used 
-    BImageControl &m_imagectrl; ///< Image control for rendering
+    FbTk::ImageControl &m_imagectrl; ///< Image control for rendering
     /**
        @name windows
     */
diff --git a/src/IconBar.cc b/src/IconBar.cc
index 2cad76a..dd80cec 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconBar.cc,v 1.22 2002/12/09 19:03:13 fluxgen Exp $
+// $Id: IconBar.cc,v 1.23 2003/01/09 22:03:06 fluxgen Exp $
 
 #include "IconBar.hh"
 #include "i18n.hh"
@@ -117,7 +117,7 @@ Window IconBar::delIcon(FluxboxWindow *fluxboxwin) {
 // with the size width * height
 //--------------------------------------
 void IconBar::loadTheme(unsigned int width, unsigned int height) {
-    BImageControl *image_ctrl = m_screen->getImageControl();
+    FbTk::ImageControl *image_ctrl = m_screen->getImageControl();
     Pixmap tmp = m_focus_pm;
     const FbTk::Texture *texture = &(m_screen->getWindowStyle()->tab.l_focus);
         
diff --git a/src/Slit.cc b/src/Slit.cc
index dfb82a8..38fd773 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Slit.cc,v 1.30 2002/12/01 13:41:59 rathnor Exp $
+// $Id: Slit.cc,v 1.31 2003/01/09 22:07:49 fluxgen Exp $
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -413,7 +413,7 @@ void Slit::reconfigure() {
         XMapWindow(disp, frame.window);
 
     Pixmap tmp = frame.pixmap;
-    BImageControl *image_ctrl = screen()->getImageControl();
+    FbTk::ImageControl *image_ctrl = screen()->getImageControl();
     const FbTk::Texture &texture = screen()->getTheme()->getSlitTexture();
     if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
         frame.pixmap = None;
diff --git a/src/Tab.cc b/src/Tab.cc
index 47faeae..69d63d8 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Tab.cc,v 1.50 2003/01/09 18:32:09 fluxgen Exp $
+// $Id: Tab.cc,v 1.51 2003/01/09 22:08:27 fluxgen Exp $
 
 #include "Tab.hh"
 
@@ -189,7 +189,7 @@ void Tab::lower() {
 // TODO optimize this
 //------------------------------------------
 void Tab::loadTheme() {
-    BImageControl *image_ctrl = m_win->getScreen()->getImageControl();
+    FbTk::ImageControl *image_ctrl = m_win->getScreen()->getImageControl();
     Pixmap tmp = m_focus_pm;
     const FbTk::Texture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus);