summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-07-10 11:33:31 (GMT)
committerfluxgen <fluxgen>2003-07-10 11:33:31 (GMT)
commit34e479a1d4b8fbaf14c23094742541df5a393ce0 (patch)
treea2e12ab4ce15cf78c48c157256640fe1f69dd1ce
parent6e416d3e406fa6376d3fcde1eb0fd7d3f7d156ae (diff)
downloadfluxbox_lack-34e479a1d4b8fbaf14c23094742541df5a393ce0.zip
fluxbox_lack-34e479a1d4b8fbaf14c23094742541df5a393ce0.tar.bz2
dont need to call constructor with menutheme
-rw-r--r--src/Window.cc7
-rw-r--r--src/Window.hh3
2 files changed, 4 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index f5c4fb9..e0ed011 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.202 2003/07/04 01:03:40 rathnor Exp $ 25// $Id: Window.cc,v 1.203 2003/07/10 11:33:31 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -220,7 +220,6 @@ void LayerMenuItem<FluxboxWindow>::click(int button, int time) {
220} 220}
221 221
222FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &tm, 222FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &tm,
223 FbTk::MenuTheme &menutheme,
224 FbTk::XLayer &layer): 223 FbTk::XLayer &layer):
225 oplock(false), 224 oplock(false),
226 m_hintsig(*this), 225 m_hintsig(*this),
@@ -235,13 +234,13 @@ FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &t
235 m_screen(scr), 234 m_screen(scr),
236 m_timer(this), 235 m_timer(this),
237 display(0), 236 display(0),
238 m_layermenu(new LayerMenu<FluxboxWindow>(menutheme, 237 m_layermenu(new LayerMenu<FluxboxWindow>(*scr.menuTheme(),
239 scr.screenNumber(), 238 scr.screenNumber(),
240 scr.imageControl(), 239 scr.imageControl(),
241 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 240 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
242 this, 241 this,
243 false)), 242 false)),
244 m_windowmenu(menutheme, scr.screenNumber(), scr.imageControl()), 243 m_windowmenu(*scr.menuTheme(), scr.screenNumber(), scr.imageControl()),
245 m_old_decoration(DECOR_NORMAL), 244 m_old_decoration(DECOR_NORMAL),
246 m_client(&client), 245 m_client(&client),
247 m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)), 246 m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)),
diff --git a/src/Window.hh b/src/Window.hh
index a7ef327..7ed7257 100644
--- a/src/Window.hh
+++ b/src/Window.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: Window.hh,v 1.82 2003/06/25 13:37:06 fluxgen Exp $ 25// $Id: Window.hh,v 1.83 2003/07/10 11:32:57 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -148,7 +148,6 @@ public:
148 /// create a window from a client 148 /// create a window from a client
149 FluxboxWindow(WinClient &client, BScreen &scr, 149 FluxboxWindow(WinClient &client, BScreen &scr,
150 FbWinFrameTheme &tm, 150 FbWinFrameTheme &tm,
151 FbTk::MenuTheme &menutheme,
152 FbTk::XLayer &layer); 151 FbTk::XLayer &layer);
153 152
154 virtual ~FluxboxWindow(); 153 virtual ~FluxboxWindow();