menu: generalized frame_background to background

background could now be a background for all DrawableControl instances
each subclass should call the parents draw() during executing the
draw() method for background painting

TODO: background should know the size of the control to only draw the
background there

1 files changed, 2 insertions, 9 deletions

diff --git a/src/menu/frame.hpp b/src/menu/frame.hpp
index 7b2e315a..eeeee4e1 100644
--- a/src/menu/frame.hpp
+++ b/src/menu/frame.hpp
@@ -31,7 +31,7 @@
 #include <log4cpp/Category.hh>
 
 #include "container.hpp"
-#include "frame_background.hpp"
+#include "background.hpp"
 
 namespace usdx
 {
@@ -39,7 +39,6 @@ namespace usdx
 	{
 	private:
 		static log4cpp::Category&  log;
-		FrameBackground* background;
 
 	protected:
 		class FrameContainerHelper : public ContainerHelper
@@ -52,17 +51,11 @@ namespace usdx
 			virtual void add(Container*) const;
 		};
 
-		virtual void draw(void);
-
 	public:
 		Frame(Container*);
-		Frame(Container*, FrameBackground*);
+		Frame(Container*, Background*);
 
 		virtual ~Frame();
-
-		void set_background(FrameBackground* background);
-
-		const FrameBackground* get_background() const;
 	};
 };