diff options
author | rathnor <rathnor> | 2003-05-06 01:45:17 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-05-06 01:45:17 (GMT) |
commit | 114a72f9b19d7d63fa228f1546d12cc602012177 (patch) | |
tree | 618f359b17f341fbc252c04e17da923f8ee37347 /src/Slit.cc | |
parent | 2ac0d82e451abd3cdc92df2a02c0da4eb8638ba1 (diff) | |
download | fluxbox-114a72f9b19d7d63fa228f1546d12cc602012177.zip fluxbox-114a72f9b19d7d63fa228f1546d12cc602012177.tar.bz2 |
change slit menus to FbMenus
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index bc54c5d..de71455 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.45 2003/05/04 20:50:15 fluxgen Exp $ | 25 | // $Id: Slit.cc,v 1.46 2003/05/06 01:45:17 rathnor Exp $ |
26 | 26 | ||
27 | #include "Slit.hh" | 27 | #include "Slit.hh" |
28 | 28 | ||
@@ -48,6 +48,7 @@ | |||
48 | #include "XLayer.hh" | 48 | #include "XLayer.hh" |
49 | #include "RootTheme.hh" | 49 | #include "RootTheme.hh" |
50 | #include "FbTk/Theme.hh" | 50 | #include "FbTk/Theme.hh" |
51 | #include "FbMenu.hh" | ||
51 | 52 | ||
52 | #include <algorithm> | 53 | #include <algorithm> |
53 | #include <iostream> | 54 | #include <iostream> |
@@ -261,13 +262,16 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) | |||
261 | : m_screen(scr), timer(this), | 262 | : m_screen(scr), timer(this), |
262 | slitmenu(*scr.menuTheme(), | 263 | slitmenu(*scr.menuTheme(), |
263 | scr.getScreenNumber(), | 264 | scr.getScreenNumber(), |
264 | *scr.getImageControl()), | 265 | *scr.getImageControl(), |
266 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | ||
265 | placement_menu(*scr.menuTheme(), | 267 | placement_menu(*scr.menuTheme(), |
266 | scr.getScreenNumber(), | 268 | scr.getScreenNumber(), |
267 | *scr.getImageControl()), | 269 | *scr.getImageControl(), |
270 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | ||
268 | clientlist_menu(*scr.menuTheme(), | 271 | clientlist_menu(*scr.menuTheme(), |
269 | scr.getScreenNumber(), | 272 | scr.getScreenNumber(), |
270 | *scr.getImageControl()), | 273 | *scr.getImageControl(), |
274 | *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | ||
271 | m_slit_layermenu(new LayerMenu<Slit>(*scr.menuTheme(), | 275 | m_slit_layermenu(new LayerMenu<Slit>(*scr.menuTheme(), |
272 | scr.getScreenNumber(), | 276 | scr.getScreenNumber(), |
273 | *scr.getImageControl(), | 277 | *scr.getImageControl(), |