aboutsummaryrefslogtreecommitdiff
path: root/src/IconButton.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconButton.hh')
-rw-r--r--src/IconButton.hh13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/IconButton.hh b/src/IconButton.hh
index b8a7ef0..54dae1d 100644
--- a/src/IconButton.hh
+++ b/src/IconButton.hh
@@ -29,13 +29,12 @@
29#include "FbTk/Observer.hh" 29#include "FbTk/Observer.hh"
30#include "FbTk/TextButton.hh" 30#include "FbTk/TextButton.hh"
31 31
32class FluxboxWindow; 32class Focusable;
33class IconbarTool;
34 33
35class IconButton: public FbTk::TextButton, public FbTk::Observer { 34class IconButton: public FbTk::TextButton, public FbTk::Observer {
36public: 35public:
37 IconButton(const IconbarTool& tool, const FbTk::FbWindow &parent, 36 IconButton(const FbTk::FbWindow &parent, FbTk::Font &font,
38 FbTk::Font &font, FluxboxWindow &window); 37 Focusable &window);
39 virtual ~IconButton(); 38 virtual ~IconButton();
40 39
41 void exposeEvent(XExposeEvent &event); 40 void exposeEvent(XExposeEvent &event);
@@ -50,8 +49,8 @@ public:
50 void update(FbTk::Subject *subj); 49 void update(FbTk::Subject *subj);
51 void setPixmap(bool use); 50 void setPixmap(bool use);
52 51
53 FluxboxWindow &win() { return m_win; } 52 Focusable &win() { return m_win; }
54 const FluxboxWindow &win() const { return m_win; } 53 const Focusable &win() const { return m_win; }
55 54
56 bool setOrientation(FbTk::Orientation orient); 55 bool setOrientation(FbTk::Orientation orient);
57 56
@@ -60,7 +59,7 @@ protected:
60private: 59private:
61 void setupWindow(); 60 void setupWindow();
62 61
63 FluxboxWindow &m_win; 62 Focusable &m_win;
64 FbTk::FbWindow m_icon_window; 63 FbTk::FbWindow m_icon_window;
65 FbTk::FbPixmap m_icon_pixmap; 64 FbTk::FbPixmap m_icon_pixmap;
66 FbTk::FbPixmap m_icon_mask; 65 FbTk::FbPixmap m_icon_mask;