From 88cc0c80d70ecb4165651e1ea1456044e7639264 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Sun, 25 Dec 2011 16:35:07 +0100
Subject: menu: Container subclasses need a Container as parent/owner

---
 src/menu/application.cpp            | 2 +-
 src/menu/application.hpp            | 3 ++-
 src/menu/frame.cpp                  | 4 ++--
 src/menu/frame.hpp                  | 4 ++--
 src/menu/software_mouse_pointer.cpp | 2 +-
 src/menu/software_mouse_pointer.hpp | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/menu')

diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index d5f9c34f..9e790b15 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -39,7 +39,7 @@ namespace usdx
 
 	Application* Application::instance = NULL;
 
-	Application::Application(Control* parent)
+	Application::Application(Container* parent)
 		: DrawableControl(parent), display(NULL), frame(NULL),
 		  fps_manager(NULL), running(false), display_width(800),
 		  display_height(600), frames_per_second(50)
diff --git a/src/menu/application.hpp b/src/menu/application.hpp
index 5564c1ad..76b451f0 100644
--- a/src/menu/application.hpp
+++ b/src/menu/application.hpp
@@ -33,6 +33,7 @@
 #include <list>
 
 #include "drawable_control.hpp"
+#include "container.hpp"
 #include "frame.hpp"
 
 namespace usdx
@@ -64,7 +65,7 @@ namespace usdx
 		void init_fps_manager(void);
 
 	protected:
-		Application(Control* parent);
+		Application(Container* parent);
 
 		void draw(void);
 
diff --git a/src/menu/frame.cpp b/src/menu/frame.cpp
index 7c05a146..899e420b 100644
--- a/src/menu/frame.cpp
+++ b/src/menu/frame.cpp
@@ -28,12 +28,12 @@
 
 namespace usdx
 {
-	Frame::Frame(Control* parent)
+	Frame::Frame(Container* parent)
 		: Container(parent), background(NULL)
 	{
 	}
 
-	Frame::Frame(Control* parent, FrameBackground* background)
+	Frame::Frame(Container* parent, FrameBackground* background)
 		: Container(parent), background(background)
 	{
 	}
diff --git a/src/menu/frame.hpp b/src/menu/frame.hpp
index 55e0a4db..a2893757 100644
--- a/src/menu/frame.hpp
+++ b/src/menu/frame.hpp
@@ -43,8 +43,8 @@ namespace usdx
 		virtual void draw(void);
 
 	public:
-		Frame(Control* parent);
-		Frame(Control* parent, FrameBackground* background);
+		Frame(Container* parent);
+		Frame(Container* parent, FrameBackground* background);
 
 		virtual ~Frame();
 
diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp
index c0787e05..90171fa9 100644
--- a/src/menu/software_mouse_pointer.cpp
+++ b/src/menu/software_mouse_pointer.cpp
@@ -30,7 +30,7 @@
 
 namespace usdx
 {
-	SoftwareMousePointer::SoftwareMousePointer(Control* parent, EventManager* event_manager)
+	SoftwareMousePointer::SoftwareMousePointer(Container* parent, EventManager* event_manager)
 		: DrawableControl(parent), x(-1), y(-1)
 	{
 		this->vertices[0] = 0.0f;
diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp
index 3b29e50e..b63904a1 100644
--- a/src/menu/software_mouse_pointer.hpp
+++ b/src/menu/software_mouse_pointer.hpp
@@ -28,7 +28,7 @@
 #define SOFTWARE_MOUSE_POINTER_HPP
 
 #include "drawable_control.hpp"
-#include "control.hpp"
+#include "container.hpp"
 #include "event_manager.hpp"
 #include "texture.hpp"
 
@@ -59,7 +59,7 @@ namespace usdx
 		void draw(void);
 
 	public:
-		SoftwareMousePointer(Control* parent, EventManager* event_manager);
+		SoftwareMousePointer(Container* parent, EventManager* event_manager);
 		virtual ~SoftwareMousePointer();
 
 		void on_mouse_move(int x, int y);
-- 
cgit v1.2.3