nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic

Browse source
This commit is contained in:
Mathias Gumz 2015-01-21 22:16:38 +01:00
parent e2dbdeeb2e
commit 6d749d6f1a
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/FbMenu.cc
View file

@ -26,7 +26,15 @@
#include "WindowCmd.hh" #include "WindowCmd.hh"
#include "FbTk/AutoReloadHelper.hh" #include "FbTk/AutoReloadHelper.hh"
FluxboxWindow *FbMenu::s_window = 0; namespace {
FluxboxWindow* s_window = 0;
}
void FbMenu::setWindow(FluxboxWindow* win) { s_window = win; }
FluxboxWindow* FbMenu::window() { return s_window; }
FbMenu::FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm, FbMenu::FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
FbTk::ImageControl &imgctrl, FbTk::Layer &layer): FbTk::ImageControl &imgctrl, FbTk::Layer &layer):

9
src/FbMenu.hh
View file

@ -37,6 +37,11 @@ class MenuTheme;
/// a layered and shaped menu /// a layered and shaped menu
class FbMenu:public FbTk::Menu { class FbMenu:public FbTk::Menu {
public: public:
static void setWindow(FluxboxWindow *win);
static FluxboxWindow *window();
FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm, FbTk::ImageControl &imgctrl, FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm, FbTk::ImageControl &imgctrl,
FbTk::Layer &layer); FbTk::Layer &layer);
virtual ~FbMenu() { } virtual ~FbMenu() { }
@ -49,13 +54,9 @@ public:
void setReloadHelper(FbTk::AutoReloadHelper *helper) { m_reloader.reset(helper); } void setReloadHelper(FbTk::AutoReloadHelper *helper) { m_reloader.reset(helper); }
FbTk::AutoReloadHelper *reloadHelper() { return m_reloader.get(); } FbTk::AutoReloadHelper *reloadHelper() { return m_reloader.get(); }
static void setWindow(FluxboxWindow *win) { s_window = win; }
static FluxboxWindow *window() { return s_window; }
private: private:
FbTk::LayerItem m_layeritem; FbTk::LayerItem m_layeritem;
std::auto_ptr<FbTk::AutoReloadHelper> m_reloader; std::auto_ptr<FbTk::AutoReloadHelper> m_reloader;
static FluxboxWindow *s_window;
}; };
#endif // FBMENU_HH #endif // FBMENU_HH