diff options
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index ab09487..c4976b5 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.113 2003/07/01 12:39:09 fluxgen Exp $ | 25 | // $Id: Screen.hh,v 1.114 2003/07/10 11:28:24 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SCREEN_HH | 27 | #ifndef SCREEN_HH |
28 | #define SCREEN_HH | 28 | #define SCREEN_HH |
@@ -33,6 +33,7 @@ | |||
33 | #include "FbRootWindow.hh" | 33 | #include "FbRootWindow.hh" |
34 | #include "NotCopyable.hh" | 34 | #include "NotCopyable.hh" |
35 | #include "fluxbox.hh" | 35 | #include "fluxbox.hh" |
36 | #include "MenuTheme.hh" | ||
36 | 37 | ||
37 | #include <X11/Xlib.h> | 38 | #include <X11/Xlib.h> |
38 | #include <X11/Xresource.h> | 39 | #include <X11/Xresource.h> |
@@ -54,7 +55,6 @@ class Strut; | |||
54 | class Slit; | 55 | class Slit; |
55 | 56 | ||
56 | namespace FbTk { | 57 | namespace FbTk { |
57 | class MenuTheme; | ||
58 | class Menu; | 58 | class Menu; |
59 | class ImageControl; | 59 | class ImageControl; |
60 | class XLayerItem; | 60 | class XLayerItem; |
@@ -190,8 +190,8 @@ public: | |||
190 | 190 | ||
191 | inline FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); } | 191 | inline FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); } |
192 | inline const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); } | 192 | inline const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); } |
193 | inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); } | 193 | inline MenuTheme *menuTheme() { return m_menutheme.get(); } |
194 | inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); } | 194 | inline const MenuTheme *menuTheme() const { return m_menutheme.get(); } |
195 | inline const RootTheme &rootTheme() const { return *m_root_theme.get(); } | 195 | inline const RootTheme &rootTheme() const { return *m_root_theme.get(); } |
196 | FbRootWindow &rootWindow() { return m_root_window; } | 196 | FbRootWindow &rootWindow() { return m_root_window; } |
197 | const FbRootWindow &rootWindow() const { return m_root_window; } | 197 | const FbRootWindow &rootWindow() const { return m_root_window; } |
@@ -383,7 +383,7 @@ private: | |||
383 | 383 | ||
384 | std::auto_ptr<FbWinFrameTheme> m_windowtheme; | 384 | std::auto_ptr<FbWinFrameTheme> m_windowtheme; |
385 | std::auto_ptr<WinButtonTheme> m_winbutton_theme; | 385 | std::auto_ptr<WinButtonTheme> m_winbutton_theme; |
386 | std::auto_ptr<FbTk::MenuTheme> m_menutheme; | 386 | std::auto_ptr<MenuTheme> m_menutheme; |
387 | std::auto_ptr<RootTheme> m_root_theme; | 387 | std::auto_ptr<RootTheme> m_root_theme; |
388 | 388 | ||
389 | FbRootWindow m_root_window; | 389 | FbRootWindow m_root_window; |