diff options
author | fluxgen <fluxgen> | 2003-12-10 23:08:06 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-10 23:08:06 (GMT) |
commit | 5ffb6290c12adc5c45a50758f90549fdfc693216 (patch) | |
tree | 6bed529f1d556b571dc0b6bfee5665aca408a6d9 /src/Window.cc | |
parent | cb8e8e8d054b044db602326278055dc10f1c0c57 (diff) | |
download | fluxbox-5ffb6290c12adc5c45a50758f90549fdfc693216.zip fluxbox-5ffb6290c12adc5c45a50758f90549fdfc693216.tar.bz2 |
cleaning in the menu code
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Window.cc b/src/Window.cc index aa2af04..c0893d6 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.249 2003/12/10 22:28:07 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.250 2003/12/10 23:08:03 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -264,7 +264,7 @@ FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &t | |||
264 | maximized(MAX_NONE), | 264 | maximized(MAX_NONE), |
265 | m_screen(scr), | 265 | m_screen(scr), |
266 | display(FbTk::App::instance()->display()), | 266 | display(FbTk::App::instance()->display()), |
267 | m_windowmenu(*scr.menuTheme(), scr.screenNumber(), scr.imageControl(), | 267 | m_windowmenu(*scr.menuTheme(), scr.imageControl(), |
268 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | 268 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), |
269 | m_old_decoration(DECOR_NORMAL), | 269 | m_old_decoration(DECOR_NORMAL), |
270 | m_client(&client), | 270 | m_client(&client), |
@@ -541,7 +541,6 @@ void FluxboxWindow::init() { | |||
541 | 541 | ||
542 | addExtraMenu("Layer...", | 542 | addExtraMenu("Layer...", |
543 | new LayerMenu<FluxboxWindow>(*screen().menuTheme(), | 543 | new LayerMenu<FluxboxWindow>(*screen().menuTheme(), |
544 | screen().screenNumber(), | ||
545 | screen().imageControl(), | 544 | screen().imageControl(), |
546 | *screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | 545 | *screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), |
547 | this, | 546 | this, |