X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=2ba916d1b39eba7e4a8e264bea550f3b3c453b69;hb=c1faa54a3218b53757b8b55de0ff8aa64412253b;hp=ad89a52b8f03ee20eed1dd71416e23c68484bccd;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index ad89a52..2ba916d 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,57 +1,79 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  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 {
 
+class Layout;
+
 /**
 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();
 
-	ChildSeq children;
+		void visibility_changed(bool);
+		void autosize_changed();
+		void request_focus();
+		void grab_pointer();
+		void ungrab_pointer();
+		void raise();
+	};
+
+	Layout *layout;
 	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 ~Panel();
+
+	virtual const char *get_class() const { return "panel"; }
+
+	void set_layout(Layout *);
+
+protected:
+	virtual Child *create_child(Widget *);
+
+public:
+	void raise(Widget &);
+	Widget *get_input_focus() const { return input_focus; }
+	Widget *get_final_input_focus() const;
 
-	void add(Widget &);
-	void remove(Widget &);
+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);
@@ -59,13 +81,12 @@ public:
 	virtual void key_press(unsigned, unsigned, wchar_t);
 	virtual void key_release(unsigned, unsigned);
 	virtual void focus_out();
-	void child_hidden(Widget &);
-private:
-	virtual const char *get_class() const { return "panel"; }
-	virtual void render_special(const Part &) const;
-	void set_pointer_focus(Widget *, int);
+protected:
+	virtual void on_child_added(Widget &);
+	virtual void on_child_removed(Widget &);
+
+	void set_pointer_focus(Widget *);
 	void set_input_focus(Widget *);
-	Widget *get_child_at(int, int);
 };
 
 } // namespace GLtk