aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-28 07:16:17 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-28 07:16:17 (GMT)
commit2940869cd7cc1688be5114451380275c9a85f5d1 (patch)
tree8200e95524356dfd45cb9ceaef0b4ea4b0816fa9 /src/Screen.hh
parent62bcfaf0e4fd7d77873343d880fc526ec58cdaa6 (diff)
downloadfluxbox_pavel-2940869cd7cc1688be5114451380275c9a85f5d1.zip
fluxbox_pavel-2940869cd7cc1688be5114451380275c9a85f5d1.tar.bz2
merge MenuTheme with FbTk::MenuTheme
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 41a7b90..689150c 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -29,8 +29,8 @@
29 29
30#include "FbWinFrame.hh" 30#include "FbWinFrame.hh"
31#include "FbRootWindow.hh" 31#include "FbRootWindow.hh"
32#include "MenuTheme.hh"
33 32
33#include "FbTk/MenuTheme.hh"
34#include "FbTk/EventHandler.hh" 34#include "FbTk/EventHandler.hh"
35#include "FbTk/Resource.hh" 35#include "FbTk/Resource.hh"
36#include "FbTk/Subject.hh" 36#include "FbTk/Subject.hh"
@@ -279,8 +279,8 @@ public:
279 279
280 FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); } 280 FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); }
281 const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); } 281 const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); }
282 MenuTheme &menuTheme() { return *m_menutheme.get(); } 282 FbTk::MenuTheme &menuTheme() { return *m_menutheme.get(); }
283 const MenuTheme &menuTheme() const { return *m_menutheme.get(); } 283 const FbTk::MenuTheme &menuTheme() const { return *m_menutheme.get(); }
284 const RootTheme &rootTheme() const { return *m_root_theme.get(); } 284 const RootTheme &rootTheme() const { return *m_root_theme.get(); }
285 WinButtonTheme &winButtonTheme() { return *m_winbutton_theme.get(); } 285 WinButtonTheme &winButtonTheme() { return *m_winbutton_theme.get(); }
286 const WinButtonTheme &winButtonTheme() const { return *m_winbutton_theme.get(); } 286 const WinButtonTheme &winButtonTheme() const { return *m_winbutton_theme.get(); }
@@ -520,7 +520,7 @@ private:
520 520
521 std::auto_ptr<FbWinFrameTheme> m_windowtheme; 521 std::auto_ptr<FbWinFrameTheme> m_windowtheme;
522 std::auto_ptr<WinButtonTheme> m_winbutton_theme; 522 std::auto_ptr<WinButtonTheme> m_winbutton_theme;
523 std::auto_ptr<MenuTheme> m_menutheme; 523 std::auto_ptr<FbTk::MenuTheme> m_menutheme;
524 std::auto_ptr<RootTheme> m_root_theme; 524 std::auto_ptr<RootTheme> m_root_theme;
525 525
526 FbRootWindow m_root_window; 526 FbRootWindow m_root_window;