1 files changed, 24 insertions, 24 deletions

diff --git a/src/Windowmenu.hh b/src/Windowmenu.hh
index 794d091..6ed6852 100644
--- a/src/Windowmenu.hh
+++ b/src/Windowmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _WINDOWMENU_HH_
-#define   _WINDOWMENU_HH_
+#ifndef  WINDOWMENU_HH
+#define  WINDOWMENU_HH
 
 // forward declaration
 class Windowmenu;
@@ -35,53 +35,53 @@ class Toolbar;
 
 class Windowmenu : public Basemenu {
 private:
-  FluxboxWindow *window;
-  BScreen *screen;
+        FluxboxWindow *window;
+        BScreen *screen;
 
  
         class SendtoWorkspacemenu : public Basemenu {
-  private:
-    Windowmenu *windowmenu;
+        private:
+                Windowmenu *windowmenu;
 
-  protected:
-    virtual void itemSelected(int, int);
+        protected:
+                virtual void itemSelected(int button, unsigned int index);
 
-  public:
-    SendtoWorkspacemenu(Windowmenu *);
+        public:
+                SendtoWorkspacemenu(Windowmenu *);
                 inline Windowmenu *getWindowMenu() const { return windowmenu; }
-    void update(void);
+                void update(void);
 
-    virtual void show(void);
-  };
+                virtual void show(void);
+        };
         
         class SendGroupToWorkspacemenu : public SendtoWorkspacemenu {   
         protected:      
-                virtual void itemSelected(int, int);
+                virtual void itemSelected(int button, unsigned int index);
         public:
-                SendGroupToWorkspacemenu(Windowmenu *);
+                SendGroupToWorkspacemenu(Windowmenu *winmenu);
                                 
         };
         
-  SendtoWorkspacemenu *sendToMenu;
+        SendtoWorkspacemenu *sendToMenu;
         SendGroupToWorkspacemenu *sendGroupToMenu;
         
-  friend class SendtoWorkspacemenu;
+        friend class SendtoWorkspacemenu;
         friend class SendGroupToWorkspacemenu;
 
 protected:
-  virtual void itemSelected(int, int);
+        virtual void itemSelected(int button, unsigned int index);
 
 
 public:
-  Windowmenu(FluxboxWindow *);
-  virtual ~Windowmenu(void);
+        Windowmenu(FluxboxWindow *);
+        virtual ~Windowmenu(void);
 
-  inline Basemenu *getSendToMenu(void) { return static_cast<Basemenu *>(sendToMenu); }
+        inline Basemenu *getSendToMenu(void) { return static_cast<Basemenu *>(sendToMenu); }
         inline Basemenu *getSendGroupToMenu(void) { return static_cast<Basemenu *>(sendGroupToMenu); }
-  void reconfigure(void);
-  void setClosable(void);
+        void reconfigure(void);
+        void setClosable(void);
 
-  virtual void show(void);
+        virtual void show(void);
 };