aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-12 18:46:01 (GMT)
committerfluxgen <fluxgen>2003-01-12 18:46:01 (GMT)
commit528f14ea0c34372f72def7e6d3c35a1766e573b1 (patch)
tree57ff2d2f422f894c52e9f47d48e37a6fa0c459f6
parent9504b64e966eb20db9ad549fbabf9838333ac406 (diff)
downloadfluxbox-528f14ea0c34372f72def7e6d3c35a1766e573b1.zip
fluxbox-528f14ea0c34372f72def7e6d3c35a1766e573b1.tar.bz2
removed menu style from Theme, and removed forward declarations of Iconmenu and Workspacemenu
-rw-r--r--src/Screen.hh5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 418cb12..c9bb2fd 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.61 2003/01/12 17:57:46 fluxgen Exp $ 25// $Id: Screen.hh,v 1.62 2003/01/12 18:46:01 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -49,8 +49,6 @@
49#include "config.h" 49#include "config.h"
50#endif // HAVE_CONFIG_H 50#endif // HAVE_CONFIG_H
51 51
52class Workspacemenu;
53class Iconmenu;
54class Netizen; 52class Netizen;
55class Slit; 53class Slit;
56class Toolbar; 54class Toolbar;
@@ -227,7 +225,6 @@ public:
227 inline void saveClock24Hour(bool c) { resource.clock24hour = c; } 225 inline void saveClock24Hour(bool c) { resource.clock24hour = c; }
228 226
229 inline Theme::WindowStyle *getWindowStyle() { return &theme->getWindowStyle(); } 227 inline Theme::WindowStyle *getWindowStyle() { return &theme->getWindowStyle(); }
230 inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); }
231 inline FbWinFrameTheme &winFrameTheme() { return m_windowtheme; } 228 inline FbWinFrameTheme &winFrameTheme() { return m_windowtheme; }
232 inline const FbWinFrameTheme &winFrameTheme() const { return m_windowtheme; } 229 inline const FbWinFrameTheme &winFrameTheme() const { return m_windowtheme; }
233 inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); } 230 inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); }