summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.hh12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 3dcdc3b..2f9db31 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.56 2003/01/05 22:24:55 fluxgen Exp $ 25// $Id: Screen.hh,v 1.57 2003/01/07 02:03:57 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -51,6 +51,10 @@ class Rootmenu;
51class Netizen; 51class Netizen;
52class Slit; 52class Slit;
53 53
54namespace FbTk {
55class MenuTheme;
56};
57
54/// Handles screen connection 58/// Handles screen connection
55/** 59/**
56 Create a toolbar and workspaces, handles switching between workspaces and windows 60 Create a toolbar and workspaces, handles switching between workspaces and windows
@@ -222,6 +226,9 @@ public:
222 inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); } 226 inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); }
223 inline FbWinFrameTheme &winFrameTheme() { return m_windowtheme; } 227 inline FbWinFrameTheme &winFrameTheme() { return m_windowtheme; }
224 inline const FbWinFrameTheme &winFrameTheme() const { return m_windowtheme; } 228 inline const FbWinFrameTheme &winFrameTheme() const { return m_windowtheme; }
229 inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); }
230 inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); }
231
225 const Theme *getTheme() const { return theme; } 232 const Theme *getTheme() const { return theme; }
226 FluxboxWindow *getIcon(unsigned int index); 233 FluxboxWindow *getIcon(unsigned int index);
227 234
@@ -349,7 +356,8 @@ private:
349 Window auto_group_window; 356 Window auto_group_window;
350 357
351 FbWinFrameTheme m_windowtheme; 358 FbWinFrameTheme m_windowtheme;
352 359 std::auto_ptr<FbTk::MenuTheme> m_menutheme;
360
353 struct ScreenResource { 361 struct ScreenResource {
354 ScreenResource(ResourceManager &rm, const std::string &scrname, 362 ScreenResource(ResourceManager &rm, const std::string &scrname,
355 const std::string &altscrname); 363 const std::string &altscrname);