adjusted for FbTk ImageControl
fluxgen fluxgen
5 files changed,
16 insertions(+),
15 deletions(-)
M
src/FbWinFrame.cc
→
src/FbWinFrame.cc
@@ -19,7 +19,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: 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 @@ m_button_pm(0) {
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),
M
src/FbWinFrame.hh
→
src/FbWinFrame.hh
@@ -19,7 +19,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: 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 @@ /// initiate inserted buttons for current theme
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 */
M
src/IconBar.cc
→
src/IconBar.cc
@@ -19,7 +19,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: 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 @@ // renders theme to m_focus_pm
// 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);
M
src/Slit.cc
→
src/Slit.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: 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 @@ else
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;
M
src/Tab.cc
→
src/Tab.cc
@@ -19,7 +19,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: 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 @@ // vertical and relative tab modes
// 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);