diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Toolbar.hh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh index 2c04bf8..29756d5 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.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: Toolbar.hh,v 1.12 2002/10/29 16:08:42 fluxgen Exp $ | 25 | // $Id: Toolbar.hh,v 1.13 2002/11/15 12:04:27 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef TOOLBAR_HH | 27 | #ifndef TOOLBAR_HH |
28 | #define TOOLBAR_HH | 28 | #define TOOLBAR_HH |
@@ -67,7 +67,7 @@ private: | |||
67 | Placementmenu(Toolbarmenu *); | 67 | Placementmenu(Toolbarmenu *); |
68 | }; | 68 | }; |
69 | 69 | ||
70 | #ifdef XINERAMA | 70 | #ifdef XINERAMA |
71 | class Headmenu : public Basemenu { | 71 | class Headmenu : public Basemenu { |
72 | public: | 72 | public: |
73 | Headmenu(Toolbarmenu *); | 73 | Headmenu(Toolbarmenu *); |
@@ -77,15 +77,13 @@ private: | |||
77 | protected: | 77 | protected: |
78 | virtual void itemSelected(int button, unsigned int index); | 78 | virtual void itemSelected(int button, unsigned int index); |
79 | }; | 79 | }; |
80 | #endif // XINERAMA | 80 | Headmenu *headmenu; |
81 | friend class Headmenu; | ||
82 | #endif // XINERAMA | ||
81 | 83 | ||
82 | 84 | ||
83 | Toolbar *toolbar; | 85 | Toolbar *toolbar; |
84 | Placementmenu *placementmenu; | 86 | Placementmenu *placementmenu; |
85 | #ifdef XINERAMA | ||
86 | Headmenu *headmenu; | ||
87 | friend class Headmenu; | ||
88 | #endif // XINERAMA | ||
89 | 87 | ||
90 | friend class Placementmenu; | 88 | friend class Placementmenu; |
91 | friend class Toolbar; | 89 | friend class Toolbar; |