diff options
author | fluxgen <fluxgen> | 2003-07-10 11:29:45 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-07-10 11:29:45 (GMT) |
commit | 6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae (patch) | |
tree | c1e15191d1a530df56a08ae7d1612767fa33ae5a /src/Screen.cc | |
parent | 876e6f7dfc079c5e83d7df0896ae215b65ae5a80 (diff) | |
download | fluxbox-6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae.zip fluxbox-6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae.tar.bz2 |
using extended fluxbox menutheme instead of fbtk menutheme
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 9 |
1 files changed, 5 insertions, 4 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 | ||
1094 | FluxboxWindow *BScreen::createWindow(WinClient &client) { | 1095 | FluxboxWindow *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) |