diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-15 21:03:57 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 10:04:02 (GMT) |
commit | 698a4af938737295494dade50950d1aeebc8b55d (patch) | |
tree | 075017c3a59ac2575f708d223cf2391e82b9eb69 /src/WinButton.hh | |
parent | 678a98de943963e993827540496741ae814af8bd (diff) | |
download | fluxbox_pavel-698a4af938737295494dade50950d1aeebc8b55d.zip fluxbox_pavel-698a4af938737295494dade50950d1aeebc8b55d.tar.bz2 |
Move declarations of Resource enums to a separate file
The reason for this is that I need to access those enums from fluxbox-update_configs and I don't
want to #include and link everything in src.
I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.
Diffstat (limited to 'src/WinButton.hh')
-rw-r--r-- | src/WinButton.hh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/WinButton.hh b/src/WinButton.hh index 80fc4b1..af3efef 100644 --- a/src/WinButton.hh +++ b/src/WinButton.hh | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "FbTk/Button.hh" | 25 | #include "FbTk/Button.hh" |
26 | #include "FbTk/FbPixmap.hh" | 26 | #include "FbTk/FbPixmap.hh" |
27 | #include "FbTk/Signal.hh" | 27 | #include "FbTk/Signal.hh" |
28 | #include "Resources.hh" | ||
28 | 29 | ||
29 | class FluxboxWindow; | 30 | class FluxboxWindow; |
30 | class WinButtonTheme; | 31 | class WinButtonTheme; |
@@ -37,12 +38,10 @@ template <class T> class ThemeProxy; | |||
37 | /// draws and handles basic window button graphic | 38 | /// draws and handles basic window button graphic |
38 | class WinButton:public FbTk::Button, public FbTk::SignalTracker { | 39 | class WinButton:public FbTk::Button, public FbTk::SignalTracker { |
39 | public: | 40 | public: |
40 | /// draw type for the button | ||
41 | enum Type {MAXIMIZE, MINIMIZE, SHADE, STICK, CLOSE, MENUICON}; | ||
42 | WinButton(FluxboxWindow &listen_to, | 41 | WinButton(FluxboxWindow &listen_to, |
43 | FbTk::ThemeProxy<WinButtonTheme> &theme, | 42 | FbTk::ThemeProxy<WinButtonTheme> &theme, |
44 | FbTk::ThemeProxy<WinButtonTheme> &pressed, | 43 | FbTk::ThemeProxy<WinButtonTheme> &pressed, |
45 | Type buttontype, const FbTk::FbWindow &parent, int x, int y, | 44 | WinButtonType buttontype, const FbTk::FbWindow &parent, int x, int y, |
46 | unsigned int width, unsigned int height); | 45 | unsigned int width, unsigned int height); |
47 | /// override for drawing | 46 | /// override for drawing |
48 | void exposeEvent(XExposeEvent &event); | 47 | void exposeEvent(XExposeEvent &event); |
@@ -59,7 +58,7 @@ public: | |||
59 | void updateAll(); | 58 | void updateAll(); |
60 | private: | 59 | private: |
61 | void drawType(); | 60 | void drawType(); |
62 | Type m_type; ///< the button type | 61 | WinButtonType m_type; ///< the button type |
63 | FluxboxWindow &m_listen_to; | 62 | FluxboxWindow &m_listen_to; |
64 | FbTk::ThemeProxy<WinButtonTheme> &m_theme, &m_pressed_theme; | 63 | FbTk::ThemeProxy<WinButtonTheme> &m_theme, &m_pressed_theme; |
65 | 64 | ||