aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-05 01:39:19 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-05 01:39:19 (GMT)
commitac1bd7e0981222bf340ce7defb2bb8307d42a0a2 (patch)
treec8fb9c618184e7ac44f6138409cab3fab86b23e4 /src/Screen.hh
parent60ba709c2f47cc2c7b877aef1b0f297b097853e5 (diff)
downloadfluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.zip
fluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.tar.bz2
update code to use ThemeProxy
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 651cdd6..deb51b8 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -27,6 +27,9 @@
27 27
28#include "FbWinFrame.hh" 28#include "FbWinFrame.hh"
29#include "FbRootWindow.hh" 29#include "FbRootWindow.hh"
30#include "RootTheme.hh"
31#include "WinButtonTheme.hh"
32#include "FbWinFrameTheme.hh"
30 33
31#include "FbTk/MenuTheme.hh" 34#include "FbTk/MenuTheme.hh"
32#include "FbTk/EventHandler.hh" 35#include "FbTk/EventHandler.hh"
@@ -52,9 +55,6 @@
52class ClientPattern; 55class ClientPattern;
53class Focusable; 56class Focusable;
54class FluxboxWindow; 57class FluxboxWindow;
55class FbWinFrameTheme;
56class RootTheme;
57class WinButtonTheme;
58class WinClient; 58class WinClient;
59class Workspace; 59class Workspace;
60class Strut; 60class Strut;
@@ -273,13 +273,13 @@ public:
273 273
274 void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); } 274 void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); }
275 275
276 FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); } 276 FbTk::ThemeProxy<FbWinFrameTheme> &winFrameTheme() { return *m_windowtheme.get(); }
277 const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); } 277 const FbTk::ThemeProxy<FbWinFrameTheme> &winFrameTheme() const { return *m_windowtheme.get(); }
278 FbTk::MenuTheme &menuTheme() { return *m_menutheme.get(); } 278 FbTk::ThemeProxy<FbTk::MenuTheme> &menuTheme() { return *m_menutheme.get(); }
279 const FbTk::MenuTheme &menuTheme() const { return *m_menutheme.get(); } 279 const FbTk::ThemeProxy<FbTk::MenuTheme> &menuTheme() const { return *m_menutheme.get(); }
280 const RootTheme &rootTheme() const { return *m_root_theme.get(); } 280 const FbTk::ThemeProxy<RootTheme> &rootTheme() const { return *m_root_theme.get(); }
281 WinButtonTheme &winButtonTheme() { return *m_winbutton_theme.get(); } 281 FbTk::ThemeProxy<WinButtonTheme> &winButtonTheme() { return *m_winbutton_theme.get(); }
282 const WinButtonTheme &winButtonTheme() const { return *m_winbutton_theme.get(); } 282 const FbTk::ThemeProxy<WinButtonTheme> &winButtonTheme() const { return *m_winbutton_theme.get(); }
283 283
284 FbRootWindow &rootWindow() { return m_root_window; } 284 FbRootWindow &rootWindow() { return m_root_window; }
285 const FbRootWindow &rootWindow() const { return m_root_window; } 285 const FbRootWindow &rootWindow() const { return m_root_window; }