1 files changed, 12 insertions, 7 deletions

diff --git a/src/ui/container.h b/src/ui/container.h
index 77e987e..ae97bdf 100644
--- a/src/ui/container.h
+++ b/src/ui/container.h
@@ -4,33 +4,38 @@
    the terms of the GNU General Public License version 2
 */
 
-/*
 #ifndef __INCLUDED_UI_CONTAINER_H__
 #define __INCLUDED_UI_CONTAINER_H__
 
 #include <string>
-#include "ui/widget.h"
+
+#include "ui/window.h"
 
 namespace ui {
 
 /// a widget containing childs of equal size
-class Container : public Widget {
+class Container : public Window {
 public:
 	Container(Widget *parent);
 	~Container();
 
-	void set_margin(const float h, const float v);
-	void set_child_size(const float width, const float height);
+	void set_margin(const float);
+	void set_childsize(const float width, const float height);
+
+	inline const math::Vector2f & childsize() const { return container_childsize; }
+
+	inline float margin() const { return container_margin; }
 
 protected:
 	virtual void resize();
 
 private:
-	math::Vector2f	container_child_size;
+	float		container_margin;
+	math::Vector2f	container_childsize;
 };
 
 }
 
 #endif // __INCLUDED_UI_CONTAINER_H__
-*/
+