nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont need to call constructor with menutheme

Browse source
This commit is contained in:
fluxgen 2003-07-10 11:33:31 +00:00
parent 6e416d3e40
commit 34e479a1d4
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.202 2003/07/04 01:03:40 rathnor Exp $ // $Id: Window.cc,v 1.203 2003/07/10 11:33:31 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -220,7 +220,6 @@ void LayerMenuItem<FluxboxWindow>::click(int button, int time) {
} }
FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &tm, FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &tm,
FbTk::MenuTheme &menutheme,
FbTk::XLayer &layer): FbTk::XLayer &layer):
oplock(false), oplock(false),
m_hintsig(*this), m_hintsig(*this),
@ -235,13 +234,13 @@ FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &t
m_screen(scr), m_screen(scr),
m_timer(this), m_timer(this),
display(0), display(0),
m_layermenu(new LayerMenu<FluxboxWindow>(menutheme, m_layermenu(new LayerMenu<FluxboxWindow>(*scr.menuTheme(),
scr.screenNumber(), scr.screenNumber(),
scr.imageControl(), scr.imageControl(),
*scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
this, this,
false)), false)),
m_windowmenu(menutheme, scr.screenNumber(), scr.imageControl()), m_windowmenu(*scr.menuTheme(), scr.screenNumber(), scr.imageControl()),
m_old_decoration(DECOR_NORMAL), m_old_decoration(DECOR_NORMAL),
m_client(&client), m_client(&client),
m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)), m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)),

3
src/Window.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.hh,v 1.82 2003/06/25 13:37:06 fluxgen Exp $ // $Id: Window.hh,v 1.83 2003/07/10 11:32:57 fluxgen Exp $
#ifndef WINDOW_HH #ifndef WINDOW_HH
#define WINDOW_HH #define WINDOW_HH
@ -148,7 +148,6 @@ public:
/// create a window from a client /// create a window from a client
FluxboxWindow(WinClient &client, BScreen &scr, FluxboxWindow(WinClient &client, BScreen &scr,
FbWinFrameTheme &tm, FbWinFrameTheme &tm,
FbTk::MenuTheme &menutheme,
FbTk::XLayer &layer); FbTk::XLayer &layer);
virtual ~FluxboxWindow(); virtual ~FluxboxWindow();