1 files changed, 59 insertions, 54 deletions

diff --git a/src/Configmenu.hh b/src/Configmenu.hh
index 4713634..2e25860 100644
--- a/src/Configmenu.hh
+++ b/src/Configmenu.hh
@@ -1,3 +1,6 @@
+// Configmenu.hh for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Configmenu.hh for Blackbox - An X11 Window Manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,8 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _CONFIGMENU_HH_
-#define   _CONFIGMENU_HH_
+// $Id: Configmenu.hh,v 1.5 2002/04/28 16:58:36 fluxgen Exp $
+
+#ifndef  CONFIGMENU_HH
+#define  CONFIGMENU_HH
 
 // forward declaration
 class Configmenu;
@@ -29,66 +34,66 @@ class Configmenu;
 #include "Screen.hh"
 #include "fluxbox.hh"
 
-
 class Configmenu : public Basemenu {
 private:
-  class Focusmenu : public Basemenu {
-  private:
-    Configmenu *configmenu;
-
-  protected:
-    virtual void itemSelected(int, int);
-
-  public:
-    Focusmenu(Configmenu *);
-  };
-
-  class Placementmenu : public Basemenu {
-  private:
-    Configmenu *configmenu;
-
-  protected:
-    virtual void itemSelected(int, int);
-
-  public:
-    Placementmenu(Configmenu *);
-  };
-
-  class Tabmenu : public Basemenu {
-  private:
-    Configmenu *configmenu;
-                void setSelected(void);
-  protected:
-    virtual void itemSelected(int, int);
-
-  public:
-    Tabmenu(Configmenu *);
-  };
-
-//  Fluxbox *fluxbox;
-  BScreen *screen;
-  Focusmenu *focusmenu;
-  Placementmenu *placementmenu;
-  Tabmenu *tabmenu;
-
-  friend class Focusmenu;
-  friend class Placementmenu;
-  friend class Tabmenu;
+        class Focusmenu : public Basemenu {
+        public:
+                Focusmenu(Configmenu *);
+        protected:
+                virtual void itemSelected(int button, unsigned int index);
+
+        private:
+                Configmenu *configmenu;
+
+        };
+
+        class Placementmenu : public Basemenu {
+        public:
+                Placementmenu(Configmenu *);
+        
+        protected:
+                virtual void itemSelected(int button, unsigned int index);
+                
+        private:
+                Configmenu *configmenu;
+        };
+
+        class Tabmenu : public Basemenu {
+        public:
+                Tabmenu(Configmenu *);
+        protected:
+                virtual void itemSelected(int button, unsigned int index);
+        private:
+                Configmenu *configmenu;
+                void setSelected();     
+        };
+
+        BScreen *screen;
+        Focusmenu *focusmenu;
+        Placementmenu *placementmenu;
+        Tabmenu *tabmenu;
+
+        friend class Focusmenu;
+        friend class Placementmenu;
+        friend class Tabmenu;
 
 
 protected:
-  virtual void itemSelected(int, int);
+        virtual void itemSelected(int button, unsigned int index);
 
 
 public:
-  Configmenu(BScreen *);
-  virtual ~Configmenu(void);
-
-  inline Basemenu *getFocusmenu(void) { return focusmenu; }
-  inline Basemenu *getPlacementmenu(void) { return placementmenu; }
-  inline Basemenu *getTabmenu(void) { return tabmenu; }
-
-  void reconfigure(void);
+        Configmenu(BScreen *);
+        virtual ~Configmenu();
+        inline Basemenu *getFocusmenu() { return focusmenu; }
+        inline Basemenu *getPlacementmenu() { return placementmenu; }
+        inline Basemenu *getTabmenu() { return tabmenu; }
+        
+        inline const Basemenu *getFocusmenu() const { return focusmenu; }
+        inline const Basemenu *getPlacementmenu() const { return placementmenu; }
+        inline const Basemenu *getTabmenu() const { return tabmenu; }
+
+        void reconfigure();
 };