X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=54e75ef5309e9e23d62645fadaf5064cafa7fddb;hb=2f70d404230954f0693a62a021b5d2ad1faed8fa;hp=529354ddb92959cce47bea069a74a0efe4036c06;hpb=95210598ff214bbc8d05657aeffc4ce7801f211a;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index 529354d..54e75ef 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,14 +1,14 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
-#include "widget.h"
+#include "container.h"
 
 namespace Msp {
 namespace GLtk {
@@ -18,41 +18,62 @@ Panels are containers for other widgets.  Panel styles should have a special
 part "children" to render the child widgets.  All properties of this part are
 ignored.
 */
-class Panel: public Widget
+class Panel: public Container
 {
 public:
 	class Loader: public Widget::Loader
 	{
+	public:
+		typedef std::map<std::string, Widget *> WidgetMap;
+
 	private:
 		Panel &pnl;
-		std::map<std::string, Widget *> &wdg_map;
+		WidgetMap &wdg_map;
 	
 	public:
-		Loader(Panel &, std::map<std::string, Widget *> &);
+		Loader(Panel &, WidgetMap &);
 	private:
 		template<typename T>
 		void child(const std::string &);
 		void panel(const std::string &);
 	};
 
-private:
-	typedef std::list<Widget *> ChildSeq;
+protected:
+	struct Child: public Container::Child
+	{
+		Child(Panel &, Widget *);
+		virtual ~Child();
+
+		void visibility_changed(bool);
+		void request_focus();
+		void grab_pointer();
+		void ungrab_pointer();
+		void raise();
+	};
 
-	ChildSeq children;
 	Widget *pointer_focus;
-	unsigned pointer_grab;
+	bool pointer_grabbed;
 	Widget *input_focus;
 
 	Panel(const Panel &);
 	Panel &operator=(const Panel &);
 public:
-	Panel(const Resources &);
-	~Panel();
+	Panel();
+
+	virtual const char *get_class() const { return "panel"; }
+
+protected:
+	virtual Child *create_child(Widget *);
 
-	void add(Widget &);
-	void remove(Widget &);
+public:
 	void raise(Widget &);
+	Widget *get_input_focus() const { return input_focus; }
+	Widget *get_final_input_focus() const;
+
+protected:
+	virtual void render_special(const Part &) const;
 
+public:
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
 	virtual void pointer_motion(int, int);
@@ -61,16 +82,9 @@ public:
 	virtual void key_release(unsigned, unsigned);
 	virtual void focus_out();
 
-	void child_hidden(Widget &);
-	void grab_pointer(Widget &);
-	void ungrab_pointer(Widget &);
-private:
-	virtual const char *get_class() const { return "panel"; }
-	virtual void render_special(const Part &) const;
-
-	void set_pointer_focus(Widget *, int);
+protected:
+	void set_pointer_focus(Widget *);
 	void set_input_focus(Widget *);
-	Widget *get_child_at(int, int);
 };
 
 } // namespace GLtk