change slit menus to FbMenus
This commit is contained in:
parent
2ac0d82e45
commit
114a72f9b1
2 changed files with 11 additions and 6 deletions
12
src/Slit.cc
12
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 <algorithm>
|
||||
#include <iostream>
|
||||
|
@ -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<Slit>(*scr.menuTheme(),
|
||||
scr.getScreenNumber(),
|
||||
*scr.getImageControl(),
|
||||
|
|
|
@ -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<SlitClient *> SlitClients;
|
||||
|
||||
SlitClients clientList;
|
||||
FbTk::Menu slitmenu, placement_menu, clientlist_menu;
|
||||
FbMenu slitmenu, placement_menu, clientlist_menu;
|
||||
std::auto_ptr<LayerMenu<Slit> > m_slit_layermenu;
|
||||
std::string m_filename;
|
||||
|
||||
|
|
Loading…
Reference in a new issue