aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-13 09:42:22 (GMT)
committerfluxgen <fluxgen>2003-08-13 09:42:22 (GMT)
commitc4ef95612c7d4f1f66c0befd515c753b7d1cfb37 (patch)
tree9f43ebf7513cea874a1d14b821458a060c3d8066
parent87c97a966801bd1bdd38e11304061bdbe5248d2e (diff)
downloadfluxbox-c4ef95612c7d4f1f66c0befd515c753b7d1cfb37.zip
fluxbox-c4ef95612c7d4f1f66c0befd515c753b7d1cfb37.tar.bz2
Button changed to a FbWindow
-rw-r--r--src/ArrowButton.cc16
-rw-r--r--src/Window.cc18
2 files changed, 17 insertions, 17 deletions
diff --git a/src/ArrowButton.cc b/src/ArrowButton.cc
index 1d3d9fe..96f2142 100644
--- a/src/ArrowButton.cc
+++ b/src/ArrowButton.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: ArrowButton.cc,v 1.3 2003/05/17 11:30:59 fluxgen Exp $ 22// $Id: ArrowButton.cc,v 1.4 2003/08/13 09:38:09 fluxgen Exp $
23 23
24#include "ArrowButton.hh" 24#include "ArrowButton.hh"
25 25
@@ -31,8 +31,8 @@ ArrowButton::ArrowButton(ArrowButton::Type arrow_type,
31 m_arrow_type(arrow_type), 31 m_arrow_type(arrow_type),
32 m_mouse_handler(0) { 32 m_mouse_handler(0) {
33 33
34 window().setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask | 34 setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
35 EnterWindowMask | LeaveWindowMask); 35 EnterWindowMask | LeaveWindowMask);
36} 36}
37 37
38ArrowButton::ArrowButton(ArrowButton::Type arrow_type, 38ArrowButton::ArrowButton(ArrowButton::Type arrow_type,
@@ -43,8 +43,8 @@ ArrowButton::ArrowButton(ArrowButton::Type arrow_type,
43 m_arrow_type(arrow_type), 43 m_arrow_type(arrow_type),
44 m_mouse_handler(0) { 44 m_mouse_handler(0) {
45 45
46 window().setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask | 46 setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
47 EnterWindowMask | LeaveWindowMask); 47 EnterWindowMask | LeaveWindowMask);
48} 48}
49 49
50void ArrowButton::clear() { 50void ArrowButton::clear() {
@@ -102,9 +102,9 @@ void ArrowButton::drawArrow() {
102 } 102 }
103 103
104 if (gc() != 0) { 104 if (gc() != 0) {
105 window().fillPolygon(gc(), 105 fillPolygon(gc(),
106 pts, 3, 106 pts, 3,
107 Convex, CoordModePrevious); 107 Convex, CoordModePrevious);
108 } 108 }
109} 109}
110 110
diff --git a/src/Window.cc b/src/Window.cc
index 3bf7731..9363edb 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.216 2003/08/11 17:04:32 fluxgen Exp $ 25// $Id: Window.cc,v 1.217 2003/08/13 09:42:22 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -381,8 +381,8 @@ void FluxboxWindow::init() {
381 btn->show(); 381 btn->show();
382 FbTk::EventManager &evm = *FbTk::EventManager::instance(); 382 FbTk::EventManager &evm = *FbTk::EventManager::instance();
383 // we need motion notify so we mask it 383 // we need motion notify so we mask it
384 btn->window().setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask | 384 btn->setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
385 ButtonMotionMask | EnterWindowMask); 385 ButtonMotionMask | EnterWindowMask);
386 386
387 FbTk::RefCount<FbTk::Command> set_client_cmd(new SetClientCmd(*m_client)); 387 FbTk::RefCount<FbTk::Command> set_client_cmd(new SetClientCmd(*m_client));
388 btn->setOnClick(set_client_cmd); 388 btn->setOnClick(set_client_cmd);
@@ -619,9 +619,9 @@ void FluxboxWindow::attachClient(WinClient &client) {
619 frame().addLabelButton(*btn); 619 frame().addLabelButton(*btn);
620 btn->show(); 620 btn->show();
621 // we need motion notify so we mask it 621 // we need motion notify so we mask it
622 btn->window().setEventMask(ExposureMask | ButtonPressMask | 622 btn->setEventMask(ExposureMask | ButtonPressMask |
623 ButtonReleaseMask | ButtonMotionMask | 623 ButtonReleaseMask | ButtonMotionMask |
624 EnterWindowMask); 624 EnterWindowMask);
625 625
626 626
627 FbTk::RefCount<FbTk::Command> 627 FbTk::RefCount<FbTk::Command>
@@ -650,9 +650,9 @@ void FluxboxWindow::attachClient(WinClient &client) {
650 btn->show(); 650 btn->show();
651 FbTk::EventManager &evm = *FbTk::EventManager::instance(); 651 FbTk::EventManager &evm = *FbTk::EventManager::instance();
652 // we need motion notify so we mask it 652 // we need motion notify so we mask it
653 btn->window().setEventMask(ExposureMask | ButtonPressMask | 653 btn->setEventMask(ExposureMask | ButtonPressMask |
654 ButtonReleaseMask | ButtonMotionMask | 654 ButtonReleaseMask | ButtonMotionMask |
655 EnterWindowMask); 655 EnterWindowMask);
656 656
657 657
658 FbTk::RefCount<FbTk::Command> set_client_cmd(new SetClientCmd(client)); 658 FbTk::RefCount<FbTk::Command> set_client_cmd(new SetClientCmd(client));