diff options
author | fluxgen <fluxgen> | 2003-05-24 13:02:49 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-05-24 13:02:49 (GMT) |
commit | 292f5c550f2286ef89530ba376b12b25d71338b3 (patch) | |
tree | e18d9319cecf0ce156201dbfe2c13a99954777e1 /src/Window.cc | |
parent | d20ace2f972b86acd60b128e85733418ed4f9061 (diff) | |
download | fluxbox-292f5c550f2286ef89530ba376b12b25d71338b3.zip fluxbox-292f5c550f2286ef89530ba376b12b25d71338b3.tar.bz2 |
reorder menus
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Window.cc b/src/Window.cc index f2a5412..320bd62 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.185 2003/05/24 12:04:39 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.186 2003/05/24 13:02:49 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -236,13 +236,13 @@ FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &t | |||
236 | m_screen(scr), | 236 | m_screen(scr), |
237 | m_timer(this), | 237 | m_timer(this), |
238 | display(0), | 238 | display(0), |
239 | m_windowmenu(menutheme, scr.screenNumber(), scr.imageControl()), | ||
240 | m_layermenu(new LayerMenu<FluxboxWindow>(menutheme, | 239 | m_layermenu(new LayerMenu<FluxboxWindow>(menutheme, |
241 | scr.screenNumber(), | 240 | scr.screenNumber(), |
242 | scr.imageControl(), | 241 | scr.imageControl(), |
243 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | 242 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), |
244 | this, | 243 | this, |
245 | false)), | 244 | false)), |
245 | m_windowmenu(menutheme, scr.screenNumber(), scr.imageControl()), | ||
246 | m_old_decoration(DECOR_NORMAL), | 246 | m_old_decoration(DECOR_NORMAL), |
247 | m_client(&client), | 247 | m_client(&client), |
248 | m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)), | 248 | m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)), |
@@ -269,13 +269,13 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen &scr, FbWinFrameTheme &tm, | |||
269 | m_screen(scr), | 269 | m_screen(scr), |
270 | m_timer(this), | 270 | m_timer(this), |
271 | display(0), | 271 | display(0), |
272 | m_windowmenu(menutheme, scr.screenNumber(), scr.imageControl()), | ||
273 | m_layermenu(new LayerMenu<FluxboxWindow>(menutheme, | 272 | m_layermenu(new LayerMenu<FluxboxWindow>(menutheme, |
274 | scr.screenNumber(), | 273 | scr.screenNumber(), |
275 | scr.imageControl(), | 274 | scr.imageControl(), |
276 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | 275 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), |
277 | this, | 276 | this, |
278 | false)), | 277 | false)), |
278 | m_windowmenu(menutheme, scr.screenNumber(), scr.imageControl()), | ||
279 | m_old_decoration(DECOR_NORMAL), | 279 | m_old_decoration(DECOR_NORMAL), |
280 | m_client(new WinClient(w, *this)), | 280 | m_client(new WinClient(w, *this)), |
281 | m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)), | 281 | m_frame(new FbWinFrame(tm, scr.imageControl(), scr.screenNumber(), 0, 0, 100, 100)), |