M src/Windowmenu.hh → src/Windowmenu.hh

@@ -22,67 +22,61 @@
 #ifndef	 WINDOWMENU_HH
 #define	 WINDOWMENU_HH
 
-// forward declaration
-class Windowmenu;
-class SendtoWorkspaceMenu;
+#include "Basemenu.hh"
 
-class Fluxbox;
 class FluxboxWindow;
-class Toolbar;
-
-#include "Basemenu.hh"
 
 
 class Windowmenu : public Basemenu {
+public:
+	Windowmenu(FluxboxWindow &fbwin);
+	virtual ~Windowmenu();
+
+	const Basemenu &getSendToMenu() const { return sendToMenu; }
+	Basemenu &getSendToMenu() { return sendToMenu; }
+	const Basemenu &getSendGroupToMenu() const { return sendGroupToMenu; }	
+	Basemenu &getSendGroupToMenu() { return sendGroupToMenu; }
+
+	void reconfigure();
+	void setClosable();
+
+	virtual void show();
+
+protected:
+	virtual void itemSelected(int button, unsigned int index);
+
 private:
-	FluxboxWindow *window;
+	FluxboxWindow &window;
 	BScreen *screen;
 
  
 	class SendtoWorkspacemenu : public Basemenu {
-	private:
-		Windowmenu *windowmenu;
-
-	protected:
-		virtual void itemSelected(int button, unsigned int index);
-
 	public:
 		SendtoWorkspacemenu(Windowmenu *);
 		inline Windowmenu *getWindowMenu() const { return windowmenu; }
-		void update(void);
+		void update();
 
-		virtual void show(void);
+		virtual void show();
+	protected:
+		virtual void itemSelected(int button, unsigned int index);
+
+	private:
+		Windowmenu *windowmenu;
+	
 	};
  	
 	class SendGroupToWorkspacemenu : public SendtoWorkspacemenu {	
-	protected:	
-		virtual void itemSelected(int button, unsigned int index);
 	public:
 		SendGroupToWorkspacemenu(Windowmenu *winmenu);
-				
+
+	protected:	
+		virtual void itemSelected(int button, unsigned int index);
 	};
 	
-	SendtoWorkspacemenu *sendToMenu;
-	SendGroupToWorkspacemenu *sendGroupToMenu;
-	
-	friend class SendtoWorkspacemenu;
-	friend class SendGroupToWorkspacemenu;
-
-protected:
-	virtual void itemSelected(int button, unsigned int index);
-
-
-public:
-	Windowmenu(FluxboxWindow *);
-	virtual ~Windowmenu(void);
-
-	inline Basemenu *getSendToMenu(void) { return static_cast<Basemenu *>(sendToMenu); }
-	inline Basemenu *getSendGroupToMenu(void) { return static_cast<Basemenu *>(sendGroupToMenu); }
-	void reconfigure(void);
-	void setClosable(void);
+	SendtoWorkspacemenu sendToMenu;
+	SendGroupToWorkspacemenu sendGroupToMenu;
 
-	virtual void show(void);
 };
 
 
-#endif // __Windowmenu_hh
+#endif // WINDOWMENU_HH