aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-07 20:08:56 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-07 20:08:56 (GMT)
commitec3125aeb95a06f08cd4895c5b7c3a8911c1b368 (patch)
tree136d27f04589d0191c48b0abe940c9eb0a17a0db /src/Screen.hh
parentdbfddf8e0bcf8e7abbba671eff64c9679332a774 (diff)
downloadfluxbox_pavel-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.zip
fluxbox_pavel-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.tar.bz2
switch FbWinFrameTheme to use FocusableTheme
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index deb51b8..5815395 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -273,8 +273,11 @@ 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 FbTk::ThemeProxy<FbWinFrameTheme> &winFrameTheme() { return *m_windowtheme.get(); } 276 FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); }
277 const FbTk::ThemeProxy<FbWinFrameTheme> &winFrameTheme() const { return *m_windowtheme.get(); } 277 const FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() const { return *m_focused_windowtheme.get(); }
278 FbTk::ThemeProxy<FbWinFrameTheme> &unfocusedWinFrameTheme() { return *m_unfocused_windowtheme.get(); }
279 const FbTk::ThemeProxy<FbWinFrameTheme> &unfocusedWinFrameTheme() const { return *m_unfocused_windowtheme.get(); }
280
278 FbTk::ThemeProxy<FbTk::MenuTheme> &menuTheme() { return *m_menutheme.get(); } 281 FbTk::ThemeProxy<FbTk::MenuTheme> &menuTheme() { return *m_menutheme.get(); }
279 const FbTk::ThemeProxy<FbTk::MenuTheme> &menuTheme() const { return *m_menutheme.get(); } 282 const FbTk::ThemeProxy<FbTk::MenuTheme> &menuTheme() const { return *m_menutheme.get(); }
280 const FbTk::ThemeProxy<RootTheme> &rootTheme() const { return *m_root_theme.get(); } 283 const FbTk::ThemeProxy<RootTheme> &rootTheme() const { return *m_root_theme.get(); }
@@ -514,7 +517,8 @@ private:
514 WorkspaceNames m_workspace_names; 517 WorkspaceNames m_workspace_names;
515 Workspaces m_workspaces_list; 518 Workspaces m_workspaces_list;
516 519
517 std::auto_ptr<FbWinFrameTheme> m_windowtheme; 520 std::auto_ptr<FbWinFrameTheme> m_focused_windowtheme,
521 m_unfocused_windowtheme;
518 std::auto_ptr<WinButtonTheme> m_winbutton_theme; 522 std::auto_ptr<WinButtonTheme> m_winbutton_theme;
519 std::auto_ptr<FbTk::MenuTheme> m_menutheme; 523 std::auto_ptr<FbTk::MenuTheme> m_menutheme;
520 std::auto_ptr<RootTheme> m_root_theme; 524 std::auto_ptr<RootTheme> m_root_theme;