1 files changed, 13 insertions, 17 deletions

diff --git a/src/Clientmenu.hh b/src/Clientmenu.hh
index 00a77f3..f49822a 100644
--- a/src/Clientmenu.hh
+++ b/src/Clientmenu.hh
@@ -19,31 +19,27 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   __Clientmenu_hh
-#define   __Clientmenu_hh
+#ifndef  CLIENTMENU_HH
+#define  CLIENTMENU_HH
 
-// forward declarations
-class Clientmenu;
 
 #include "Basemenu.hh"
-#include "Workspace.hh"
-#include "fluxbox.hh"
-
-
-class Clientmenu : public Basemenu {
-private:
-  BScreen *screen;
-  Workspace *wkspc;
-
 
-protected:
-  virtual void itemSelected(int, int);
+// forward declarations
+class Workspace;
 
 
+class Clientmenu : public Basemenu {
 public:
-  Clientmenu(Workspace *);
+        Clientmenu(Workspace *wrksp);
+        
+protected:
+        virtual void itemSelected(int button, unsigned int index);
+        
+private:
+        Workspace *m_wkspc;
 };
 
 
-#endif // __Clientmenu_hh
+#endif // _CLIENTMENU_HH_