aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
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 /src/Window.cc
parent3dc7ab05994208549917e57323ba60194b2ec420 (diff)
downloadfluxbox-3006ba49e41538bcc0c4afe958875c59a34550a9.zip
fluxbox-3006ba49e41538bcc0c4afe958875c59a34550a9.tar.bz2
moved textbutton to fbtk
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc12
1 files changed, 6 insertions, 6 deletions
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());