aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-06 01:45:17 (GMT)
committerrathnor <rathnor>2003-05-06 01:45:17 (GMT)
commit114a72f9b19d7d63fa228f1546d12cc602012177 (patch)
tree618f359b17f341fbc252c04e17da923f8ee37347
parent2ac0d82e451abd3cdc92df2a02c0da4eb8638ba1 (diff)
downloadfluxbox_paul-114a72f9b19d7d63fa228f1546d12cc602012177.zip
fluxbox_paul-114a72f9b19d7d63fa228f1546d12cc602012177.tar.bz2
change slit menus to FbMenus
-rw-r--r--src/Slit.cc12
-rw-r--r--src/Slit.hh5
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 @@
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(),
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 @@
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.hh,v 1.24 2003/04/25 16:55:39 fluxgen Exp $ 25/// $Id: Slit.hh,v 1.25 2003/05/06 01:45:17 rathnor Exp $
26 26
27#ifndef SLIT_HH 27#ifndef SLIT_HH
28#define SLIT_HH 28#define SLIT_HH
@@ -43,6 +43,7 @@
43class SlitTheme; 43class SlitTheme;
44class SlitClient; 44class SlitClient;
45class BScreen; 45class BScreen;
46class FbMenu;
46 47
47/// Handles dock apps 48/// Handles dock apps
48class Slit : public FbTk::TimeoutHandler, public FbTk::EventHandler { 49class Slit : public FbTk::TimeoutHandler, public FbTk::EventHandler {
@@ -125,7 +126,7 @@ private:
125 typedef std::list<SlitClient *> SlitClients; 126 typedef std::list<SlitClient *> SlitClients;
126 127
127 SlitClients clientList; 128 SlitClients clientList;
128 FbTk::Menu slitmenu, placement_menu, clientlist_menu; 129 FbMenu slitmenu, placement_menu, clientlist_menu;
129 std::auto_ptr<LayerMenu<Slit> > m_slit_layermenu; 130 std::auto_ptr<LayerMenu<Slit> > m_slit_layermenu;
130 std::string m_filename; 131 std::string m_filename;
131 132