make PreferredSize optional and clean up a few that are no longer needed

robn · Jun 6, 2012 · f009e7a · f009e7a
1 parent 03592e1
commit f009e7a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/src/ui/FloatContainer.cpp b/src/ui/FloatContainer.cpp
@@ -2,11 +2,6 @@
 
 namespace UI {
 
-vector2f FloatContainer::PreferredSize()
-{
-	return vector2f(FLT_MAX, FLT_MAX);
-}
-
 void FloatContainer::Layout()
 {
 	LayoutChildren();

diff --git a/src/ui/FloatContainer.h b/src/ui/FloatContainer.h
@@ -7,13 +7,14 @@ namespace UI {
 
 class FloatContainer : public Container {
 public:
-	virtual vector2f PreferredSize();
 	virtual void Layout();
 
 	void AddWidget(Widget *w, const vector2f &pos, const vector2f &size);
 	void RemoveWidget(Widget *w);
 
 private:
+	virtual vector2f PreferredSize() { return 0; }
+
 	friend class Context;
 	FloatContainer(Context *context) : Container(context) {}
 };

diff --git a/src/ui/Grid.h b/src/ui/Grid.h
@@ -12,7 +12,6 @@ class Grid : public Container {
 	Grid(Context *context, const CellSpec &rowSpec, const CellSpec &colSpec) : Container(context), m_rowSpec(rowSpec), m_colSpec(colSpec), m_widgets(m_rowSpec.numCells*m_colSpec.numCells) {}
 
 public:
-	virtual vector2f PreferredSize() { return 0; }
 	virtual void Layout();
 
 	Grid *SetRow(int rowNum, const WidgetSet &set);

diff --git a/src/ui/Widget.h b/src/ui/Widget.h
@@ -84,7 +84,7 @@ class Widget : public RefCounted {
 public:
 	virtual ~Widget();
 
-	virtual vector2f PreferredSize() = 0;
+	virtual vector2f PreferredSize() { return 0; }
 	virtual void Layout() {}
 	virtual void Update() {}
 	virtual void Draw() = 0;