aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/menu/container.hpp6
-rw-r--r--src/menu/control.hpp9
-rw-r--r--src/menu/drawable_control.hpp2
-rw-r--r--src/menu/frame.hpp4
4 files changed, 10 insertions, 11 deletions
diff --git a/src/menu/container.hpp b/src/menu/container.hpp
index a558462e..c8f0351b 100644
--- a/src/menu/container.hpp
+++ b/src/menu/container.hpp
@@ -41,11 +41,11 @@ namespace usdx
virtual void draw(void);
public:
- Container(Container* parent);
+ Container(Container*);
virtual ~Container();
- void add(DrawableControl *child);
- void remove(DrawableControl *child);
+ virtual void add(DrawableControl*);
+ virtual void remove(DrawableControl*);
};
};
diff --git a/src/menu/control.hpp b/src/menu/control.hpp
index c48098b3..d178d4f0 100644
--- a/src/menu/control.hpp
+++ b/src/menu/control.hpp
@@ -39,15 +39,14 @@ namespace usdx
protected:
std::list<Control*> slaves;
- void add_slave(Control *new_slave);
- void remove_slave(Control *slave);
+ void add_slave(Control*);
+ void remove_slave(Control*);
public:
- Control(Control *owner);
+ Control(Control*);
virtual ~Control();
- void set_owner(Control *owner);
-
+ void set_owner(Control*);
Control* get_owner(void) const;
};
};
diff --git a/src/menu/drawable_control.hpp b/src/menu/drawable_control.hpp
index fcab05da..e85e9c6b 100644
--- a/src/menu/drawable_control.hpp
+++ b/src/menu/drawable_control.hpp
@@ -42,7 +42,7 @@ namespace usdx
Container* parent;
public:
- DrawableControl(Container* parent);
+ DrawableControl(Container*);
virtual ~DrawableControl();
};
};
diff --git a/src/menu/frame.hpp b/src/menu/frame.hpp
index a2893757..7a43d59b 100644
--- a/src/menu/frame.hpp
+++ b/src/menu/frame.hpp
@@ -43,8 +43,8 @@ namespace usdx
virtual void draw(void);
public:
- Frame(Container* parent);
- Frame(Container* parent, FrameBackground* background);
+ Frame(Container*);
+ Frame(Container*, FrameBackground*);
virtual ~Frame();