diff options
author | fluxgen <fluxgen> | 2003-04-27 01:54:18 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-27 01:54:18 (GMT) |
commit | 41f40a68db72ae685af0b184bf1d26531ee7e836 (patch) | |
tree | c79678a0cea5384c4ac791ea62429a14dc4e8f5f | |
parent | 6b44b9c17311efe4134eb99a46e03c64dcf6b77c (diff) | |
download | fluxbox-41f40a68db72ae685af0b184bf1d26531ee7e836.zip fluxbox-41f40a68db72ae685af0b184bf1d26531ee7e836.tar.bz2 |
minor fixes
-rw-r--r-- | src/ArrowButton.cc | 12 | ||||
-rw-r--r-- | src/ArrowButton.hh | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/ArrowButton.cc b/src/ArrowButton.cc index dfcc05d..bc44393 100644 --- a/src/ArrowButton.cc +++ b/src/ArrowButton.cc | |||
@@ -1,5 +1,5 @@ | |||
1 | // ArrowButton.cc for Fluxbox Window Manager | 1 | // ArrowButton.cc for Fluxbox Window Manager |
2 | // Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net) | 2 | // Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -19,12 +19,10 @@ | |||
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.1 2002/12/13 20:21:09 fluxgen Exp $ | 22 | // $Id: ArrowButton.cc,v 1.2 2003/04/27 01:54:18 fluxgen Exp $ |
23 | 23 | ||
24 | #include "ArrowButton.hh" | 24 | #include "ArrowButton.hh" |
25 | 25 | ||
26 | #include "App.hh" | ||
27 | |||
28 | ArrowButton::ArrowButton(ArrowButton::Type arrow_type, | 26 | ArrowButton::ArrowButton(ArrowButton::Type arrow_type, |
29 | FbTk::FbWindow &parent, | 27 | FbTk::FbWindow &parent, |
30 | int x, int y, | 28 | int x, int y, |
@@ -87,9 +85,9 @@ void ArrowButton::drawArrow() { | |||
87 | } | 85 | } |
88 | 86 | ||
89 | if (gc() != 0) { | 87 | if (gc() != 0) { |
90 | Display *disp = FbTk::App::instance()->display(); | 88 | window().fillPolygon(gc(), |
91 | XFillPolygon(disp, window().window(), gc(), | 89 | pts, 3, |
92 | pts, 3, Convex, CoordModePrevious); | 90 | Convex, CoordModePrevious); |
93 | } | 91 | } |
94 | } | 92 | } |
95 | 93 | ||
diff --git a/src/ArrowButton.hh b/src/ArrowButton.hh index 13ac102..bcad0f2 100644 --- a/src/ArrowButton.hh +++ b/src/ArrowButton.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // ArrowButton.hh for Fluxbox Window Manager | 1 | // ArrowButton.hh for Fluxbox Window Manager |
2 | // Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net) | 2 | // Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -19,12 +19,13 @@ | |||
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.hh,v 1.1 2002/12/13 20:21:12 fluxgen Exp $ | 22 | // $Id: ArrowButton.hh,v 1.2 2003/04/27 01:54:18 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef ARROWBUTTON_HH | 24 | #ifndef ARROWBUTTON_HH |
25 | #define ARROWBUTTON_HH | 25 | #define ARROWBUTTON_HH |
26 | 26 | ||
27 | #include "Button.hh" | 27 | #include "Button.hh" |
28 | |||
28 | /// Displays a arrow on a button | 29 | /// Displays a arrow on a button |
29 | class ArrowButton: public FbTk::Button { | 30 | class ArrowButton: public FbTk::Button { |
30 | public: | 31 | public: |