aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbWinFrame.cc6
-rw-r--r--src/FbWinFrame.hh13
-rw-r--r--src/IconBar.cc4
-rw-r--r--src/Slit.cc4
-rw-r--r--src/Tab.cc4
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 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.cc,v 1.3 2003/01/09 18:03:33 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.4 2003/01/09 22:01:30 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25#include "ImageControl.hh"
@@ -29,7 +29,7 @@
29#include <iostream> 29#include <iostream>
30using namespace std; 30using namespace std;
31 31
32FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, int screen_num, int x, int y, 32FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, int screen_num, int x, int y,
33 unsigned int width, unsigned int height): 33 unsigned int width, unsigned int height):
34 m_theme(theme), 34 m_theme(theme),
35 m_imagectrl(imgctrl), 35 m_imagectrl(imgctrl),
@@ -67,7 +67,7 @@ FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, int scree
67 init(); 67 init();
68} 68}
69/* 69/*
70 FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, const FbTk::FbWindow &parent, int x, int y, 70 FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, const FbTk::FbWindow &parent, int x, int y,
71 unsigned int width, unsigned int height): 71 unsigned int width, unsigned int height):
72 m_theme(theme), 72 m_theme(theme),
73 m_imagectrl(imgctrl), 73 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 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.hh,v 1.2 2003/01/07 01:28:16 fluxgen Exp $ 22// $Id: FbWinFrame.hh,v 1.3 2003/01/09 22:00:34 fluxgen Exp $
23 23
24#ifndef FBWINFRAME_HH 24#ifndef FBWINFRAME_HH
25#define FBWINFRAME_HH 25#define FBWINFRAME_HH
@@ -36,20 +36,21 @@
36#include <vector> 36#include <vector>
37#include <string> 37#include <string>
38 38
39
40class FbWinFrameTheme; 39class FbWinFrameTheme;
41class BImageControl; 40namespace FbTk {
41class ImageControl;
42};
42 43
43/// holds a window frame with a client window (see: <a href="fluxbox_fbwinframe.png">image</a>) 44/// holds a window frame with a client window (see: <a href="fluxbox_fbwinframe.png">image</a>)
44class FbWinFrame:public FbTk::EventHandler { 45class FbWinFrame:public FbTk::EventHandler {
45public: 46public:
46 47
47 /// create a top level window 48 /// create a top level window
48 FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, int screen_num, int x, int y, 49 FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, int screen_num, int x, int y,
49 unsigned int width, unsigned int height); 50 unsigned int width, unsigned int height);
50 51
51 /// create a frame window inside another FbWindow, NOT IMPLEMENTED! 52 /// create a frame window inside another FbWindow, NOT IMPLEMENTED!
52 FbWinFrame(FbWinFrameTheme &theme, BImageControl &imgctrl, const FbTk::FbWindow &parent, 53 FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, const FbTk::FbWindow &parent,
53 int x, int y, 54 int x, int y,
54 unsigned int width, unsigned int height); 55 unsigned int width, unsigned int height);
55 56
@@ -170,7 +171,7 @@ private:
170 void setupButton(FbTk::Button &btn); 171 void setupButton(FbTk::Button &btn);
171 172
172 FbWinFrameTheme &m_theme; ///< theme to be used 173 FbWinFrameTheme &m_theme; ///< theme to be used
173 BImageControl &m_imagectrl; ///< Image control for rendering 174 FbTk::ImageControl &m_imagectrl; ///< Image control for rendering
174 /** 175 /**
175 @name windows 176 @name windows
176 */ 177 */
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 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: IconBar.cc,v 1.22 2002/12/09 19:03:13 fluxgen Exp $ 22// $Id: IconBar.cc,v 1.23 2003/01/09 22:03:06 fluxgen Exp $
23 23
24#include "IconBar.hh" 24#include "IconBar.hh"
25#include "i18n.hh" 25#include "i18n.hh"
@@ -117,7 +117,7 @@ Window IconBar::delIcon(FluxboxWindow *fluxboxwin) {
117// with the size width * height 117// with the size width * height
118//-------------------------------------- 118//--------------------------------------
119void IconBar::loadTheme(unsigned int width, unsigned int height) { 119void IconBar::loadTheme(unsigned int width, unsigned int height) {
120 BImageControl *image_ctrl = m_screen->getImageControl(); 120 FbTk::ImageControl *image_ctrl = m_screen->getImageControl();
121 Pixmap tmp = m_focus_pm; 121 Pixmap tmp = m_focus_pm;
122 const FbTk::Texture *texture = &(m_screen->getWindowStyle()->tab.l_focus); 122 const FbTk::Texture *texture = &(m_screen->getWindowStyle()->tab.l_focus);
123 123
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 @@
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: Slit.cc,v 1.30 2002/12/01 13:41:59 rathnor Exp $ 25// $Id: Slit.cc,v 1.31 2003/01/09 22:07:49 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -413,7 +413,7 @@ void Slit::reconfigure() {
413 XMapWindow(disp, frame.window); 413 XMapWindow(disp, frame.window);
414 414
415 Pixmap tmp = frame.pixmap; 415 Pixmap tmp = frame.pixmap;
416 BImageControl *image_ctrl = screen()->getImageControl(); 416 FbTk::ImageControl *image_ctrl = screen()->getImageControl();
417 const FbTk::Texture &texture = screen()->getTheme()->getSlitTexture(); 417 const FbTk::Texture &texture = screen()->getTheme()->getSlitTexture();
418 if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 418 if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
419 frame.pixmap = None; 419 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 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.cc,v 1.50 2003/01/09 18:32:09 fluxgen Exp $ 22// $Id: Tab.cc,v 1.51 2003/01/09 22:08:27 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -189,7 +189,7 @@ void Tab::lower() {
189// TODO optimize this 189// TODO optimize this
190//------------------------------------------ 190//------------------------------------------
191void Tab::loadTheme() { 191void Tab::loadTheme() {
192 BImageControl *image_ctrl = m_win->getScreen()->getImageControl(); 192 FbTk::ImageControl *image_ctrl = m_win->getScreen()->getImageControl();
193 Pixmap tmp = m_focus_pm; 193 Pixmap tmp = m_focus_pm;
194 const FbTk::Texture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus); 194 const FbTk::Texture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus);
195 195