diff options
Diffstat (limited to 'src/Xinerama.hh')
-rw-r--r-- | src/Xinerama.hh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Xinerama.hh b/src/Xinerama.hh index ad4b3c0..8bbd3d1 100644 --- a/src/Xinerama.hh +++ b/src/Xinerama.hh | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: Xinerama.hh,v 1.3 2003/07/10 11:58:36 fluxgen Exp $ | 23 | // $Id: Xinerama.hh,v 1.4 2003/07/19 11:55:49 rathnor Exp $ |
24 | 24 | ||
25 | #ifndef XINERAMA_HH | 25 | #ifndef XINERAMA_HH |
26 | #define XINERAMA_HH | 26 | #define XINERAMA_HH |
@@ -42,20 +42,20 @@ | |||
42 | template <typename ItemType> | 42 | template <typename ItemType> |
43 | class XineramaHeadMenuItem : public FbTk::MenuItem { | 43 | class XineramaHeadMenuItem : public FbTk::MenuItem { |
44 | public: | 44 | public: |
45 | XineramaHeadMenuItem(const char *label, ItemType *object, int headnum, | 45 | XineramaHeadMenuItem(const char *label, ItemType &object, int headnum, |
46 | FbTk::RefCount<FbTk::Command> &cmd): | 46 | FbTk::RefCount<FbTk::Command> &cmd): |
47 | FbTk::MenuItem(label,cmd), m_object(object), m_headnum(headnum) {} | 47 | FbTk::MenuItem(label,cmd), m_object(object), m_headnum(headnum) {} |
48 | XineramaHeadMenuItem(const char *label, ItemType *object, int headnum): | 48 | XineramaHeadMenuItem(const char *label, ItemType &object, int headnum): |
49 | FbTk::MenuItem(label), m_object(object), m_headnum(headnum) {} | 49 | FbTk::MenuItem(label), m_object(object), m_headnum(headnum) {} |
50 | 50 | ||
51 | bool isEnabled() const { return true; } //m_object->screen().getOnHead(*m_object) != m_headnum; } ; | 51 | bool isEnabled() const { return m_object.getOnHead() != m_headnum; } |
52 | void click(int button, int time) { | 52 | void click(int button, int time) { |
53 | // m_object->screen().setOnHead(*m_object, m_headnum); | 53 | m_object.saveOnHead(m_headnum); |
54 | FbTk::MenuItem::click(button, time); | 54 | FbTk::MenuItem::click(button, time); |
55 | } | 55 | } |
56 | 56 | ||
57 | private: | 57 | private: |
58 | ItemType *m_object; | 58 | ItemType &m_object; |
59 | int m_headnum; | 59 | int m_headnum; |
60 | }; | 60 | }; |
61 | 61 | ||
@@ -65,16 +65,16 @@ template <typename ItemType> | |||
65 | class XineramaHeadMenu : public FbMenu { | 65 | class XineramaHeadMenu : public FbMenu { |
66 | public: | 66 | public: |
67 | XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl, | 67 | XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl, |
68 | FbTk::XLayer &layer, ItemType *item); | 68 | FbTk::XLayer &layer, ItemType &item); |
69 | 69 | ||
70 | private: | 70 | private: |
71 | ItemType *m_object; | 71 | ItemType &m_object; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | 74 | ||
75 | template <typename ItemType> | 75 | template <typename ItemType> |
76 | XineramaHeadMenu<ItemType>::XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl, | 76 | XineramaHeadMenu<ItemType>::XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl, |
77 | FbTk::XLayer &layer, ItemType *item): | 77 | FbTk::XLayer &layer, ItemType &item): |
78 | FbMenu(tm, screen.screenNumber(), imgctrl, layer), | 78 | FbMenu(tm, screen.screenNumber(), imgctrl, layer), |
79 | m_object(item) | 79 | m_object(item) |
80 | { | 80 | { |