diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-07 20:08:56 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-07 20:08:56 (GMT) |
commit | ec3125aeb95a06f08cd4895c5b7c3a8911c1b368 (patch) | |
tree | 136d27f04589d0191c48b0abe940c9eb0a17a0db /src/Window.hh | |
parent | dbfddf8e0bcf8e7abbba671eff64c9679332a774 (diff) | |
download | fluxbox-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.zip fluxbox-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.tar.bz2 |
switch FbWinFrameTheme to use FocusableTheme
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Window.hh b/src/Window.hh index a4c0fa2..c66024a 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "FbTk/XLayerItem.hh" | 33 | #include "FbTk/XLayerItem.hh" |
34 | #include "FbWinFrame.hh" | 34 | #include "FbWinFrame.hh" |
35 | #include "Focusable.hh" | 35 | #include "Focusable.hh" |
36 | #include "FocusableTheme.hh" | ||
36 | #include "WinButton.hh" | 37 | #include "WinButton.hh" |
37 | 38 | ||
38 | #include <sys/time.h> | 39 | #include <sys/time.h> |
@@ -150,8 +151,7 @@ public: | |||
150 | typedef std::list<WinClient *> ClientList; | 151 | typedef std::list<WinClient *> ClientList; |
151 | 152 | ||
152 | /// create a window from a client | 153 | /// create a window from a client |
153 | FluxboxWindow(WinClient &client, | 154 | FluxboxWindow(WinClient &client, FbTk::XLayer &layer); |
154 | FbTk::ThemeProxy<FbWinFrameTheme> &tm, FbTk::XLayer &layer); | ||
155 | 155 | ||
156 | virtual ~FluxboxWindow(); | 156 | virtual ~FluxboxWindow(); |
157 | 157 | ||
@@ -610,6 +610,8 @@ private: | |||
610 | unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state | 610 | unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state |
611 | int m_last_button_x, ///< last known x position of the mouse button | 611 | int m_last_button_x, ///< last known x position of the mouse button |
612 | m_last_button_y; ///< last known y position of the mouse button | 612 | m_last_button_y; ///< last known y position of the mouse button |
613 | |||
614 | FocusableTheme<FbWinFrameTheme> m_theme; | ||
613 | FbWinFrame m_frame; ///< the actuall window frame | 615 | FbWinFrame m_frame; ///< the actuall window frame |
614 | 616 | ||
615 | bool m_placed; ///< determine whether or not we should place the window | 617 | bool m_placed; ///< determine whether or not we should place the window |