From 114a72f9b19d7d63fa228f1546d12cc602012177 Mon Sep 17 00:00:00 2001 From: rathnor Date: Tue, 6 May 2003 01:45:17 +0000 Subject: change slit menus to FbMenus --- src/Slit.cc | 12 ++++++++---- src/Slit.hh | 5 +++-- 2 files changed, 11 insertions(+), 6 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Slit.cc,v 1.45 2003/05/04 20:50:15 fluxgen Exp $ +// $Id: Slit.cc,v 1.46 2003/05/06 01:45:17 rathnor Exp $ #include "Slit.hh" @@ -48,6 +48,7 @@ #include "XLayer.hh" #include "RootTheme.hh" #include "FbTk/Theme.hh" +#include "FbMenu.hh" #include #include @@ -261,13 +262,16 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) : m_screen(scr), timer(this), slitmenu(*scr.menuTheme(), scr.getScreenNumber(), - *scr.getImageControl()), + *scr.getImageControl(), + *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), placement_menu(*scr.menuTheme(), scr.getScreenNumber(), - *scr.getImageControl()), + *scr.getImageControl(), + *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), clientlist_menu(*scr.menuTheme(), scr.getScreenNumber(), - *scr.getImageControl()), + *scr.getImageControl(), + *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), m_slit_layermenu(new LayerMenu(*scr.menuTheme(), scr.getScreenNumber(), *scr.getImageControl(), diff --git a/src/Slit.hh b/src/Slit.hh index 74f69f9..80dd95c 100644 --- a/src/Slit.hh +++ b/src/Slit.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -/// $Id: Slit.hh,v 1.24 2003/04/25 16:55:39 fluxgen Exp $ +/// $Id: Slit.hh,v 1.25 2003/05/06 01:45:17 rathnor Exp $ #ifndef SLIT_HH #define SLIT_HH @@ -43,6 +43,7 @@ class SlitTheme; class SlitClient; class BScreen; +class FbMenu; /// Handles dock apps class Slit : public FbTk::TimeoutHandler, public FbTk::EventHandler { @@ -125,7 +126,7 @@ private: typedef std::list SlitClients; SlitClients clientList; - FbTk::Menu slitmenu, placement_menu, clientlist_menu; + FbMenu slitmenu, placement_menu, clientlist_menu; std::auto_ptr > m_slit_layermenu; std::string m_filename; -- cgit v0.11.2