diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-04-11 21:19:48 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-13 22:40:52 +0100 |
commit | e0e9997a5e92ce2a31f0ff4d139109be4434105b (patch) | |
tree | e8c3baa67eb65ffc16a9c96fdbb067d142f194bd /src/menu/frame.hpp | |
parent | 40caf6163ff2e1274d71146c207fbde0c099b089 (diff) | |
download | usdx-e0e9997a5e92ce2a31f0ff4d139109be4434105b.tar.gz usdx-e0e9997a5e92ce2a31f0ff4d139109be4434105b.tar.xz usdx-e0e9997a5e92ce2a31f0ff4d139109be4434105b.zip |
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
Diffstat (limited to 'src/menu/frame.hpp')
-rw-r--r-- | src/menu/frame.hpp | 11 |
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; }; }; |