diff options
-rw-r--r-- | src/Slit.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index e5fcf37..63b1eb4 100644 --- a/src/Slit.cc +++ b/src/Slit.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: Slit.cc,v 1.41 2003/04/25 10:46:07 fluxgen Exp $ | 25 | // $Id: Slit.cc,v 1.42 2003/04/25 17:27:36 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Slit.hh" | 27 | #include "Slit.hh" |
28 | 28 | ||
@@ -265,17 +265,15 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) | |||
265 | clientlist_menu(*scr.menuTheme(), | 265 | clientlist_menu(*scr.menuTheme(), |
266 | scr.getScreenNumber(), | 266 | scr.getScreenNumber(), |
267 | *scr.getImageControl()), | 267 | *scr.getImageControl()), |
268 | slit_layermenu(0), | 268 | m_slit_layermenu(new LayerMenu<Slit>(*scr.menuTheme(), |
269 | scr.getScreenNumber(), | ||
270 | *scr.getImageControl(), | ||
271 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | ||
272 | this, | ||
273 | true)), | ||
269 | m_layeritem(0), | 274 | m_layeritem(0), |
270 | m_slit_theme(new SlitTheme(*this)) { | 275 | m_slit_theme(new SlitTheme(*this)) { |
271 | 276 | ||
272 | slit_layermenu.reset(new LayerMenu<Slit>(*scr.menuTheme(), | ||
273 | scr.getScreenNumber(), | ||
274 | *scr.getImageControl(), | ||
275 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | ||
276 | this, | ||
277 | true)); | ||
278 | |||
279 | // default placement and direction | 277 | // default placement and direction |
280 | m_direction = screen().getSlitDirection(); | 278 | m_direction = screen().getSlitDirection(); |
281 | m_placement = screen().getSlitPlacement(); | 279 | m_placement = screen().getSlitPlacement(); |
@@ -1141,7 +1139,7 @@ void Slit::setupMenu() { | |||
1141 | "Placement"), | 1139 | "Placement"), |
1142 | &placement_menu); | 1140 | &placement_menu); |
1143 | 1141 | ||
1144 | slitmenu.insert("Layer...", slit_layermenu.get()); | 1142 | slitmenu.insert("Layer...", m_slit_layermenu.get()); |
1145 | 1143 | ||
1146 | slitmenu.insert(new BoolMenuItem(i18n->getMessage( | 1144 | slitmenu.insert(new BoolMenuItem(i18n->getMessage( |
1147 | CommonSet, CommonAutoHide, | 1145 | CommonSet, CommonAutoHide, |