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/Toolbar.cc | |
parent | cb8e8e8d054b044db602326278055dc10f1c0c57 (diff) | |
download | fluxbox-5ffb6290c12adc5c45a50758f90549fdfc693216.zip fluxbox-5ffb6290c12adc5c45a50758f90549fdfc693216.tar.bz2 |
cleaning in the menu code
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index bd55854..d2dcefc 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.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: Toolbar.cc,v 1.130 2003/12/08 17:29:44 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.131 2003/12/10 23:08:03 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -192,16 +192,15 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width): | |||
192 | m_window_pm(0), | 192 | m_window_pm(0), |
193 | m_screen(scrn), | 193 | m_screen(scrn), |
194 | m_layermenu(*scrn.menuTheme(), | 194 | m_layermenu(*scrn.menuTheme(), |
195 | scrn.screenNumber(), | ||
196 | scrn.imageControl(), | 195 | scrn.imageControl(), |
197 | *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | 196 | *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), |
198 | this, | 197 | this, |
199 | true), | 198 | true), |
200 | m_placementmenu(*scrn.menuTheme(), | 199 | m_placementmenu(*scrn.menuTheme(), |
201 | scrn.screenNumber(), scrn.imageControl(), | 200 | scrn.imageControl(), |
202 | *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | 201 | *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), |
203 | m_toolbarmenu(*scrn.menuTheme(), | 202 | m_toolbarmenu(*scrn.menuTheme(), |
204 | scrn.screenNumber(), scrn.imageControl(), | 203 | scrn.imageControl(), |
205 | *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | 204 | *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), |
206 | m_theme(scrn.screenNumber()), | 205 | m_theme(scrn.screenNumber()), |
207 | m_layeritem(frame.window, layer), | 206 | m_layeritem(frame.window, layer), |