diff options
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r-- | src/FbWinFrame.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index 800bc0e..6196cf3 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh | |||
@@ -40,13 +40,13 @@ class FbWinFrameTheme; | |||
40 | class BScreen; | 40 | class BScreen; |
41 | class IconButton; | 41 | class IconButton; |
42 | class Focusable; | 42 | class Focusable; |
43 | template <class T> class FocusableTheme; | ||
43 | 44 | ||
44 | namespace FbTk { | 45 | namespace FbTk { |
45 | class ImageControl; | 46 | class ImageControl; |
46 | class Command; | 47 | class Command; |
47 | class Texture; | 48 | class Texture; |
48 | class XLayer; | 49 | class XLayer; |
49 | template <class T> class ThemeProxy; | ||
50 | } | 50 | } |
51 | 51 | ||
52 | /// holds a window frame with a client window | 52 | /// holds a window frame with a client window |
@@ -96,7 +96,7 @@ public: | |||
96 | }; | 96 | }; |
97 | 97 | ||
98 | /// create a top level window | 98 | /// create a top level window |
99 | FbWinFrame(BScreen &screen, FbTk::ThemeProxy<FbWinFrameTheme> &theme, | 99 | FbWinFrame(BScreen &screen, FocusableTheme<FbWinFrameTheme> &theme, |
100 | FbTk::ImageControl &imgctrl, | 100 | FbTk::ImageControl &imgctrl, |
101 | FbTk::XLayer &layer, | 101 | FbTk::XLayer &layer, |
102 | int x, int y, | 102 | int x, int y, |
@@ -255,7 +255,7 @@ public: | |||
255 | FbTk::FbWindow &gripRight() { return m_grip_right; } | 255 | FbTk::FbWindow &gripRight() { return m_grip_right; } |
256 | bool focused() const { return m_focused; } | 256 | bool focused() const { return m_focused; } |
257 | bool isShaded() const { return m_shaded; } | 257 | bool isShaded() const { return m_shaded; } |
258 | FbTk::ThemeProxy<FbWinFrameTheme> &theme() const { return m_theme; } | 258 | FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; } |
259 | /// @return titlebar height | 259 | /// @return titlebar height |
260 | unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } | 260 | unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } |
261 | unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } | 261 | unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } |
@@ -314,7 +314,7 @@ private: | |||
314 | 314 | ||
315 | BScreen &m_screen; | 315 | BScreen &m_screen; |
316 | 316 | ||
317 | FbTk::ThemeProxy<FbWinFrameTheme> &m_theme; ///< theme to be used | 317 | FocusableTheme<FbWinFrameTheme> &m_theme; ///< theme to be used |
318 | FbTk::ImageControl &m_imagectrl; ///< Image control for rendering | 318 | FbTk::ImageControl &m_imagectrl; ///< Image control for rendering |
319 | /** | 319 | /** |
320 | @name windows | 320 | @name windows |