aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-07-10 11:29:45 (GMT)
committerfluxgen <fluxgen>2003-07-10 11:29:45 (GMT)
commit6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae (patch)
treec1e15191d1a530df56a08ae7d1612767fa33ae5a
parent876e6f7dfc079c5e83d7df0896ae215b65ae5a80 (diff)
downloadfluxbox_paul-6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae.zip
fluxbox_paul-6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae.tar.bz2
using extended fluxbox menutheme instead of fbtk menutheme
-rw-r--r--src/Screen.cc9
-rw-r--r--src/Screen.hh10
2 files changed, 10 insertions, 9 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c33a5bb..21f8481 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -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.cc,v 1.201 2003/07/04 01:03:40 rathnor Exp $ 25// $Id: Screen.cc,v 1.202 2003/07/10 11:29:45 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -56,6 +56,7 @@
56#include "Strut.hh" 56#include "Strut.hh"
57#include "SlitTheme.hh" 57#include "SlitTheme.hh"
58#include "CommandParser.hh" 58#include "CommandParser.hh"
59#include "MenuTheme.hh"
59 60
60//use GNU extensions 61//use GNU extensions
61#ifndef _GNU_SOURCE 62#ifndef _GNU_SOURCE
@@ -287,7 +288,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
287 // because winbutton need to rescale the pixmaps in winbutton theme 288 // because winbutton need to rescale the pixmaps in winbutton theme
288 // after fbwinframe have resized them 289 // after fbwinframe have resized them
289 m_winbutton_theme(new WinButtonTheme(scrn)), 290 m_winbutton_theme(new WinButtonTheme(scrn)),
290 m_menutheme(new FbTk::MenuTheme(scrn)), 291 m_menutheme(new MenuTheme(scrn)),
291 m_root_theme(new 292 m_root_theme(new
292 RootTheme(scrn, 293 RootTheme(scrn,
293 *resource.rootcommand)), 294 *resource.rootcommand)),
@@ -1049,7 +1050,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1049 win = winclient->fbwindow(); 1050 win = winclient->fbwindow();
1050 else { 1051 else {
1051 win = new FluxboxWindow(*winclient, *this, 1052 win = new FluxboxWindow(*winclient, *this,
1052 winFrameTheme(), *menuTheme(), 1053 winFrameTheme(),
1053 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); 1054 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
1054 1055
1055 new_win = true; 1056 new_win = true;
@@ -1093,7 +1094,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1093 1094
1094FluxboxWindow *BScreen::createWindow(WinClient &client) { 1095FluxboxWindow *BScreen::createWindow(WinClient &client) {
1095 FluxboxWindow *win = new FluxboxWindow(client, *this, 1096 FluxboxWindow *win = new FluxboxWindow(client, *this,
1096 winFrameTheme(), *menuTheme(), 1097 winFrameTheme(),
1097 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); 1098 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
1098#ifdef SLIT 1099#ifdef SLIT
1099 if (win->initialState() == WithdrawnState) 1100 if (win->initialState() == WithdrawnState)
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;
54class Slit; 55class Slit;
55 56
56namespace FbTk { 57namespace FbTk {
57class MenuTheme;
58class Menu; 58class Menu;
59class ImageControl; 59class ImageControl;
60class XLayerItem; 60class 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;