aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-19 16:15:32 (GMT)
committerfluxgen <fluxgen>2003-08-19 16:15:32 (GMT)
commit3006ba49e41538bcc0c4afe958875c59a34550a9 (patch)
tree71ceaafcbd5e15bf594b3603e8448e3e8f650049
parent3dc7ab05994208549917e57323ba60194b2ec420 (diff)
downloadfluxbox_paul-3006ba49e41538bcc0c4afe958875c59a34550a9.zip
fluxbox_paul-3006ba49e41538bcc0c4afe958875c59a34550a9.tar.bz2
moved textbutton to fbtk
-rw-r--r--src/ClockTool.hh6
-rw-r--r--src/FbWinFrame.cc30
-rw-r--r--src/FbWinFrame.hh22
-rw-r--r--src/IconButton.cc6
-rw-r--r--src/IconButton.hh7
-rw-r--r--src/Window.cc12
-rw-r--r--src/Window.hh8
-rw-r--r--src/WorkspaceNameTool.hh6
8 files changed, 49 insertions, 48 deletions
diff --git a/src/ClockTool.hh b/src/ClockTool.hh
index 9dd6d1b..9978f27 100644
--- a/src/ClockTool.hh
+++ b/src/ClockTool.hh
@@ -20,15 +20,15 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ClockTool.hh,v 1.2 2003/08/13 09:35:38 fluxgen Exp $ 23// $Id: ClockTool.hh,v 1.3 2003/08/19 16:12:43 fluxgen Exp $
24 24
25#ifndef CLOCKTOOL_HH 25#ifndef CLOCKTOOL_HH
26#define CLOCKTOOL_HH 26#define CLOCKTOOL_HH
27 27
28 28
29#include "ToolbarItem.hh" 29#include "ToolbarItem.hh"
30#include "TextButton.hh"
31 30
31#include "FbTk/TextButton.hh"
32#include "FbTk/Observer.hh" 32#include "FbTk/Observer.hh"
33#include "FbTk/Resource.hh" 33#include "FbTk/Resource.hh"
34#include "FbTk/Timer.hh" 34#include "FbTk/Timer.hh"
@@ -63,7 +63,7 @@ private:
63 void update(FbTk::Subject *subj); 63 void update(FbTk::Subject *subj);
64 void renderTheme(); 64 void renderTheme();
65 65
66 TextButton m_button; 66 FbTk::TextButton m_button;
67 67
68 const ToolTheme &m_theme; 68 const ToolTheme &m_theme;
69 BScreen &m_screen; 69 BScreen &m_screen;
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index c65f0b6..f23568b 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,13 +19,15 @@
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.36 2003/08/13 16:36:37 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.37 2003/08/19 16:13:25 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25
26#include "EventManager.hh" 26#include "FbTk/ImageControl.hh"
27#include "TextButton.hh" 27#include "FbTk/EventManager.hh"
28#include "App.hh" 28#include "FbTk/TextButton.hh"
29#include "FbTk/App.hh"
30
29#include "FbWinFrameTheme.hh" 31#include "FbWinFrameTheme.hh"
30#ifdef SHAPE 32#ifdef SHAPE
31#include "Shape.hh" 33#include "Shape.hh"
@@ -271,7 +273,7 @@ void FbWinFrame::removeAllButtons() {
271 } 273 }
272} 274}
273 275
274void FbWinFrame::addLabelButton(TextButton &btn) { 276void FbWinFrame::addLabelButton(FbTk::TextButton &btn) {
275 LabelList::iterator found_it = find(m_labelbuttons.begin(), 277 LabelList::iterator found_it = find(m_labelbuttons.begin(),
276 m_labelbuttons.end(), 278 m_labelbuttons.end(),
277 &btn); 279 &btn);
@@ -282,7 +284,7 @@ void FbWinFrame::addLabelButton(TextButton &btn) {
282 m_labelbuttons.push_back(&btn); 284 m_labelbuttons.push_back(&btn);
283} 285}
284 286
285void FbWinFrame::removeLabelButton(TextButton &btn) { 287void FbWinFrame::removeLabelButton(FbTk::TextButton &btn) {
286 LabelList::iterator erase_it = remove(m_labelbuttons.begin(), 288 LabelList::iterator erase_it = remove(m_labelbuttons.begin(),
287 m_labelbuttons.end(), 289 m_labelbuttons.end(),
288 &btn); 290 &btn);
@@ -293,7 +295,7 @@ void FbWinFrame::removeLabelButton(TextButton &btn) {
293} 295}
294 296
295 297
296void FbWinFrame::moveLabelButtonLeft(const TextButton &btn) { 298void FbWinFrame::moveLabelButtonLeft(const FbTk::TextButton &btn) {
297 LabelList::iterator it = find(m_labelbuttons.begin(), 299 LabelList::iterator it = find(m_labelbuttons.begin(),
298 m_labelbuttons.end(), 300 m_labelbuttons.end(),
299 &btn); 301 &btn);
@@ -303,7 +305,7 @@ void FbWinFrame::moveLabelButtonLeft(const TextButton &btn) {
303 305
304 LabelList::iterator new_pos = it; 306 LabelList::iterator new_pos = it;
305 new_pos--; 307 new_pos--;
306 TextButton *item = *it; 308 FbTk::TextButton *item = *it;
307 // remove from list 309 // remove from list
308 m_labelbuttons.erase(it); 310 m_labelbuttons.erase(it);
309 // insert on the new place 311 // insert on the new place
@@ -312,7 +314,7 @@ void FbWinFrame::moveLabelButtonLeft(const TextButton &btn) {
312 redrawTitle(); 314 redrawTitle();
313} 315}
314 316
315void FbWinFrame::moveLabelButtonRight(const TextButton &btn) { 317void FbWinFrame::moveLabelButtonRight(const FbTk::TextButton &btn) {
316 LabelList::iterator it = find(m_labelbuttons.begin(), 318 LabelList::iterator it = find(m_labelbuttons.begin(),
317 m_labelbuttons.end(), 319 m_labelbuttons.end(),
318 &btn); 320 &btn);
@@ -320,7 +322,7 @@ void FbWinFrame::moveLabelButtonRight(const TextButton &btn) {
320 if (it == m_labelbuttons.end() || *it == m_labelbuttons.back()) 322 if (it == m_labelbuttons.end() || *it == m_labelbuttons.back())
321 return; 323 return;
322 324
323 TextButton *item = *it; 325 FbTk::TextButton *item = *it;
324 // remove from list 326 // remove from list
325 LabelList::iterator new_pos = m_labelbuttons.erase(it); 327 LabelList::iterator new_pos = m_labelbuttons.erase(it);
326 new_pos++; 328 new_pos++;
@@ -330,7 +332,7 @@ void FbWinFrame::moveLabelButtonRight(const TextButton &btn) {
330 redrawTitle(); 332 redrawTitle();
331} 333}
332 334
333void FbWinFrame::setLabelButtonFocus(TextButton &btn) { 335void FbWinFrame::setLabelButtonFocus(FbTk::TextButton &btn) {
334 LabelList::iterator it = find(m_labelbuttons.begin(), 336 LabelList::iterator it = find(m_labelbuttons.begin(),
335 m_labelbuttons.end(), 337 m_labelbuttons.end(),
336 &btn); 338 &btn);
@@ -1031,7 +1033,7 @@ void FbWinFrame::setBorderWidth(unsigned int borderW) {
1031 resize(width(), height() + bw_changes); 1033 resize(width(), height() + bw_changes);
1032} 1034}
1033 1035
1034void FbWinFrame::renderButtonFocus(TextButton &button) { 1036void FbWinFrame::renderButtonFocus(FbTk::TextButton &button) {
1035 1037
1036 button.setGC(theme().labelTextFocusGC()); 1038 button.setGC(theme().labelTextFocusGC());
1037 button.setJustify(theme().justify()); 1039 button.setJustify(theme().justify());
@@ -1046,7 +1048,7 @@ void FbWinFrame::renderButtonFocus(TextButton &button) {
1046 button.clear(); 1048 button.clear();
1047} 1049}
1048 1050
1049void FbWinFrame::renderButtonUnfocus(TextButton &button) { 1051void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) {
1050 button.setGC(theme().labelTextUnfocusGC()); 1052 button.setGC(theme().labelTextUnfocusGC());
1051 button.setJustify(theme().justify()); 1053 button.setJustify(theme().justify());
1052 button.setBorderWidth(1); 1054 button.setBorderWidth(1);
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index ce3fa2a..2379c24 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.12 2003/08/13 16:36:37 fluxgen Exp $ 22// $Id: FbWinFrame.hh,v 1.13 2003/08/19 16:13:25 fluxgen Exp $
23 23
24#ifndef FBWINFRAME_HH 24#ifndef FBWINFRAME_HH
25#define FBWINFRAME_HH 25#define FBWINFRAME_HH
@@ -38,9 +38,9 @@
38 38
39class Shape; 39class Shape;
40class FbWinFrameTheme; 40class FbWinFrameTheme;
41class TextButton;
42 41
43namespace FbTk { 42namespace FbTk {
43class TextButton;
44class ImageControl; 44class ImageControl;
45class Command; 45class Command;
46class Button; 46class Button;
@@ -93,15 +93,15 @@ public:
93 /// remove all buttons from titlebar 93 /// remove all buttons from titlebar
94 void removeAllButtons(); 94 void removeAllButtons();
95 /// adds a button to label window 95 /// adds a button to label window
96 void addLabelButton(TextButton &btn); 96 void addLabelButton(FbTk::TextButton &btn);
97 /// removes a specific button from label window 97 /// removes a specific button from label window
98 void removeLabelButton(TextButton &btn); 98 void removeLabelButton(FbTk::TextButton &btn);
99 /// move label button to the left 99 /// move label button to the left
100 void moveLabelButtonLeft(const TextButton &btn); 100 void moveLabelButtonLeft(const FbTk::TextButton &btn);
101 /// move label button to the right 101 /// move label button to the right
102 void moveLabelButtonRight(const TextButton &btn); 102 void moveLabelButtonRight(const FbTk::TextButton &btn);
103 /// which button is to be rendered focused 103 /// which button is to be rendered focused
104 void setLabelButtonFocus(TextButton &btn); 104 void setLabelButtonFocus(FbTk::TextButton &btn);
105 /// attach a client window for client area 105 /// attach a client window for client area
106 void setClientWindow(Window win); 106 void setClientWindow(Window win);
107 /// same as above but with FbWindow 107 /// same as above but with FbWindow
@@ -182,8 +182,8 @@ private:
182 void renderTitlebar(); 182 void renderTitlebar();
183 void renderHandles(); 183 void renderHandles();
184 void renderButtons(); 184 void renderButtons();
185 void renderButtonFocus(TextButton &button); 185 void renderButtonFocus(FbTk::TextButton &button);
186 void renderButtonUnfocus(TextButton &button); 186 void renderButtonUnfocus(FbTk::TextButton &button);
187 void renderLabel(); 187 void renderLabel();
188 /// renders to pixmap or sets color 188 /// renders to pixmap or sets color
189 void render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm, 189 void render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm,
@@ -217,9 +217,9 @@ private:
217 typedef std::vector<FbTk::Button *> ButtonList; 217 typedef std::vector<FbTk::Button *> ButtonList;
218 ButtonList m_buttons_left, ///< buttons to the left 218 ButtonList m_buttons_left, ///< buttons to the left
219 m_buttons_right; ///< buttons to the right 219 m_buttons_right; ///< buttons to the right
220 typedef std::list<TextButton *> LabelList; 220 typedef std::list<FbTk::TextButton *> LabelList;
221 LabelList m_labelbuttons; ///< holds label buttons inside label window 221 LabelList m_labelbuttons; ///< holds label buttons inside label window
222 TextButton *m_current_label; ///< which client button is focused at the moment 222 FbTk::TextButton *m_current_label; ///< which client button is focused at the moment
223 std::string m_titletext; ///< text to be displayed int m_label 223 std::string m_titletext; ///< text to be displayed int m_label
224 int m_bevel; ///< bevel between titlebar items and titlebar 224 int m_bevel; ///< bevel between titlebar items and titlebar
225 bool m_use_titlebar; ///< if we should use titlebar 225 bool m_use_titlebar; ///< if we should use titlebar
diff --git a/src/IconButton.cc b/src/IconButton.cc
index ce4719a..a1e8cf0 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconButton.cc,v 1.5 2003/08/16 12:04:12 fluxgen Exp $ 23// $Id: IconButton.cc,v 1.6 2003/08/19 16:13:25 fluxgen Exp $
24 24
25#include "IconButton.hh" 25#include "IconButton.hh"
26 26
@@ -42,7 +42,7 @@
42 42
43IconButton::IconButton(const FbTk::FbWindow &parent, const FbTk::Font &font, 43IconButton::IconButton(const FbTk::FbWindow &parent, const FbTk::Font &font,
44 FluxboxWindow &win): 44 FluxboxWindow &win):
45 TextButton(parent, font, win.winClient().title()), 45 FbTk::TextButton(parent, font, win.winClient().title()),
46 m_win(win), 46 m_win(win),
47 m_icon_window(*this, 1, 1, 1, 1, 47 m_icon_window(*this, 1, 1, 1, 1,
48 ExposureMask | ButtonPressMask | ButtonReleaseMask) { 48 ExposureMask | ButtonPressMask | ButtonReleaseMask) {
@@ -51,7 +51,7 @@ IconButton::IconButton(const FbTk::FbWindow &parent, const FbTk::Font &font,
51 setOnClick(focus); 51 setOnClick(focus);
52 52
53 m_win.hintSig().attach(this); 53 m_win.hintSig().attach(this);
54 54
55 FbTk::EventManager::instance()->add(*this, m_icon_window); 55 FbTk::EventManager::instance()->add(*this, m_icon_window);
56 56
57 update(0); 57 update(0);
diff --git a/src/IconButton.hh b/src/IconButton.hh
index de5440c..8367e1a 100644
--- a/src/IconButton.hh
+++ b/src/IconButton.hh
@@ -20,19 +20,18 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconButton.hh,v 1.1 2003/08/11 15:45:50 fluxgen Exp $ 23// $Id: IconButton.hh,v 1.2 2003/08/19 16:13:25 fluxgen Exp $
24 24
25#ifndef ICONBUTTON_HH 25#ifndef ICONBUTTON_HH
26#define ICONBUTTON_HH 26#define ICONBUTTON_HH
27 27
28#include "FbTk/FbPixmap.hh" 28#include "FbTk/FbPixmap.hh"
29#include "FbTk/Observer.hh" 29#include "FbTk/Observer.hh"
30 30#include "FbTk/TextButton.hh"
31#include "TextButton.hh"
32 31
33class FluxboxWindow; 32class FluxboxWindow;
34 33
35class IconButton: public TextButton, public FbTk::Observer { 34class IconButton: public FbTk::TextButton, public FbTk::Observer {
36public: 35public:
37 IconButton(const FbTk::FbWindow &parent, const FbTk::Font &font, FluxboxWindow &window); 36 IconButton(const FbTk::FbWindow &parent, const FbTk::Font &font, FluxboxWindow &window);
38 virtual ~IconButton(); 37 virtual ~IconButton();
diff --git a/src/Window.cc b/src/Window.cc
index 1ac095a..b5ef439 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.218 2003/08/13 16:39:24 fluxgen Exp $ 25// $Id: Window.cc,v 1.219 2003/08/19 16:13:25 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -34,7 +34,7 @@
34#include "Netizen.hh" 34#include "Netizen.hh"
35#include "FbWinFrameTheme.hh" 35#include "FbWinFrameTheme.hh"
36#include "MenuTheme.hh" 36#include "MenuTheme.hh"
37#include "TextButton.hh" 37#include "FbTk/TextButton.hh"
38#include "EventManager.hh" 38#include "EventManager.hh"
39#include "FbAtoms.hh" 39#include "FbAtoms.hh"
40#include "RootTheme.hh" 40#include "RootTheme.hh"
@@ -371,7 +371,7 @@ void FluxboxWindow::init() {
371 frame().gripRight().setCursor(frame().theme().lowerRightAngleCursor()); 371 frame().gripRight().setCursor(frame().theme().lowerRightAngleCursor());
372 372
373 frame().resize(m_client->width(), m_client->height()); 373 frame().resize(m_client->width(), m_client->height());
374 TextButton *btn = new TextButton(frame().label(), 374 FbTk::TextButton *btn = new FbTk::TextButton(frame().label(),
375 frame().theme().font(), 375 frame().theme().font(),
376 m_client->title()); 376 m_client->title());
377 btn->setJustify(frame().theme().justify()); 377 btn->setJustify(frame().theme().justify());
@@ -611,7 +611,7 @@ void FluxboxWindow::attachClient(WinClient &client) {
611 (*client_it)->m_win = this; 611 (*client_it)->m_win = this;
612 // create a labelbutton for this client and 612 // create a labelbutton for this client and
613 // associate it with the pointer 613 // associate it with the pointer
614 TextButton *btn = new TextButton(frame().label(), 614 FbTk::TextButton *btn = new FbTk::TextButton(frame().label(),
615 frame().theme().font(), 615 frame().theme().font(),
616 (*client_it)->title()); 616 (*client_it)->title());
617 btn->setJustify(frame().theme().justify()); 617 btn->setJustify(frame().theme().justify());
@@ -642,7 +642,7 @@ void FluxboxWindow::attachClient(WinClient &client) {
642 642
643 } else { // client.fbwindow() == 0 643 } else { // client.fbwindow() == 0
644 // create a labelbutton for this client and associate it with the pointer 644 // create a labelbutton for this client and associate it with the pointer
645 TextButton *btn = new TextButton(frame().label(), 645 FbTk::TextButton *btn = new FbTk::TextButton(frame().label(),
646 frame().theme().font(), 646 frame().theme().font(),
647 client.title()); 647 client.title());
648 m_labelbuttons[&client] = btn; 648 m_labelbuttons[&client] = btn;
@@ -774,7 +774,7 @@ bool FluxboxWindow::removeClient(WinClient &client) {
774 FbTk::EventManager &evm = *FbTk::EventManager::instance(); 774 FbTk::EventManager &evm = *FbTk::EventManager::instance();
775 evm.remove(client.window()); 775 evm.remove(client.window());
776 776
777 TextButton *label_btn = m_labelbuttons[&client]; 777 FbTk::TextButton *label_btn = m_labelbuttons[&client];
778 if (label_btn != 0) { 778 if (label_btn != 0) {
779 frame().removeLabelButton(*label_btn); 779 frame().removeLabelButton(*label_btn);
780 evm.remove(label_btn->window()); 780 evm.remove(label_btn->window());
diff --git a/src/Window.hh b/src/Window.hh
index f65d17c..767b273 100644
--- a/src/Window.hh
+++ b/src/Window.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: Window.hh,v 1.91 2003/08/11 16:57:11 fluxgen Exp $ 25// $Id: Window.hh,v 1.92 2003/08/19 16:13:25 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -44,10 +44,10 @@
44class WinClient; 44class WinClient;
45class FbWinFrameTheme; 45class FbWinFrameTheme;
46class BScreen; 46class BScreen;
47
48class TextButton;
49class FbWinFrame; 47class FbWinFrame;
48
50namespace FbTk { 49namespace FbTk {
50class TextButton;
51class MenuTheme; 51class MenuTheme;
52class ImageControl; 52class ImageControl;
53class XLayer; 53class XLayer;
@@ -428,7 +428,7 @@ private:
428 428
429 ClientList m_clientlist; 429 ClientList m_clientlist;
430 WinClient *m_client; 430 WinClient *m_client;
431 typedef std::map<WinClient *, TextButton *> Client2ButtonMap; 431 typedef std::map<WinClient *, FbTk::TextButton *> Client2ButtonMap;
432 Client2ButtonMap m_labelbuttons; 432 Client2ButtonMap m_labelbuttons;
433 433
434 // just temporary solution 434 // just temporary solution
diff --git a/src/WorkspaceNameTool.hh b/src/WorkspaceNameTool.hh
index 0dc49ac..f7cc4f0 100644
--- a/src/WorkspaceNameTool.hh
+++ b/src/WorkspaceNameTool.hh
@@ -20,14 +20,14 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: WorkspaceNameTool.hh,v 1.2 2003/08/13 10:19:57 fluxgen Exp $ 23// $Id: WorkspaceNameTool.hh,v 1.3 2003/08/19 16:15:32 fluxgen Exp $
24 24
25#ifndef WORKSPACENAMETOOL_HH 25#ifndef WORKSPACENAMETOOL_HH
26#define WORKSPACENAMETOOL_HH 26#define WORKSPACENAMETOOL_HH
27 27
28#include "ToolbarItem.hh" 28#include "ToolbarItem.hh"
29#include "TextButton.hh"
30 29
30#include "FbTk/TextButton.hh"
31#include "FbTk/Observer.hh" 31#include "FbTk/Observer.hh"
32 32
33class BScreen; 33class BScreen;
@@ -53,7 +53,7 @@ public:
53 53
54private: 54private:
55 void renderTheme(); 55 void renderTheme();
56 TextButton m_button; 56 FbTk::TextButton m_button;
57 const ToolTheme &m_theme; 57 const ToolTheme &m_theme;
58 BScreen &m_screen; 58 BScreen &m_screen;
59 Pixmap m_pixmap; 59 Pixmap m_pixmap;