M src/Screen.cc → src/Screen.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.201 2003/07/04 01:03:40 rathnor Exp $
+// $Id: Screen.cc,v 1.202 2003/07/10 11:29:45 fluxgen Exp $
 
 
 #include "Screen.hh"
@@ -56,6 +56,7 @@ #include "FbWindow.hh"
 #include "Strut.hh"
 #include "SlitTheme.hh"
 #include "CommandParser.hh"
+#include "MenuTheme.hh"
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -287,7 +288,7 @@ // the order of windowtheme and winbutton theme is important
     // because winbutton need to rescale the pixmaps in winbutton theme
     // after fbwinframe have resized them
     m_winbutton_theme(new WinButtonTheme(scrn)),
-    m_menutheme(new FbTk::MenuTheme(scrn)),
+    m_menutheme(new MenuTheme(scrn)),
     m_root_theme(new 
                  RootTheme(scrn, 
                            *resource.rootcommand)),
@@ -1049,7 +1050,7 @@ if (winclient->fbwindow()) // may have been set in an atomhandler
             win = winclient->fbwindow();
         else {
             win = new FluxboxWindow(*winclient, *this, 
-                                    winFrameTheme(), *menuTheme(),
+                                    winFrameTheme(),
                                     *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
             
             new_win = true;
@@ -1093,7 +1094,7 @@ }
 
 FluxboxWindow *BScreen::createWindow(WinClient &client) {
     FluxboxWindow *win = new FluxboxWindow(client, *this, 
-                                           winFrameTheme(), *menuTheme(),
+                                           winFrameTheme(),
                                            *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
 #ifdef SLIT
     if (win->initialState() == WithdrawnState)

M src/Screen.hh → src/Screen.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.hh,v 1.113 2003/07/01 12:39:09 fluxgen Exp $
+// $Id: Screen.hh,v 1.114 2003/07/10 11:28:24 fluxgen Exp $
 
 #ifndef	 SCREEN_HH
 #define	 SCREEN_HH
@@ -33,6 +33,7 @@ #include "MultLayers.hh"
 #include "FbRootWindow.hh"
 #include "NotCopyable.hh"
 #include "fluxbox.hh"
+#include "MenuTheme.hh"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
@@ -54,7 +55,6 @@ class Strut;
 class Slit;
 
 namespace FbTk {
-class MenuTheme;
 class Menu;
 class ImageControl;
 class XLayerItem;
@@ -190,8 +190,8 @@ inline void saveClock24Hour(bool c) { resource.clock24hour = c; }
 
     inline FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); }
     inline const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); }
-    inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); }
-    inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); }
+    inline MenuTheme *menuTheme() { return m_menutheme.get(); }
+    inline const MenuTheme *menuTheme() const { return m_menutheme.get(); }
     inline const RootTheme &rootTheme() const { return *m_root_theme.get(); }
     FbRootWindow &rootWindow() { return m_root_window; }
     const FbRootWindow &rootWindow() const { return m_root_window; }
@@ -383,7 +383,7 @@ Window auto_group_window;
 
     std::auto_ptr<FbWinFrameTheme> m_windowtheme;
     std::auto_ptr<WinButtonTheme> m_winbutton_theme;
-    std::auto_ptr<FbTk::MenuTheme> m_menutheme;
+    std::auto_ptr<MenuTheme> m_menutheme;
     std::auto_ptr<RootTheme> m_root_theme;
 
     FbRootWindow m_root_window;