M src/Toolbar.hh → src/Toolbar.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.hh,v 1.12 2002/10/29 16:08:42 fluxgen Exp $
+// $Id: Toolbar.hh,v 1.13 2002/11/15 12:04:27 fluxgen Exp $
 
 #ifndef	 TOOLBAR_HH
 #define	 TOOLBAR_HH
@@ -67,7 +67,7 @@ public:
 		Placementmenu(Toolbarmenu *);
 	};
 
-	#ifdef XINERAMA
+#ifdef XINERAMA
 	class Headmenu : public Basemenu {
 	public:
 		Headmenu(Toolbarmenu *);
@@ -77,15 +77,13 @@
 	protected:
 		virtual void itemSelected(int button, unsigned int index); 
 	};
-	#endif // XINERAMA
+	Headmenu *headmenu;
+	friend class Headmenu;
+#endif // XINERAMA
  
 
 	Toolbar *toolbar;
 	Placementmenu *placementmenu;
-	#ifdef XINERAMA
-	Headmenu *headmenu;
-	friend class Headmenu;
-	#endif // XINERAMA
 
 	friend class Placementmenu;
 	friend class Toolbar;