X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=c50725b9b940cb255ed635ad665cc82c55bddfe7;hb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;hp=748ecb48d508c53c32a7186ede84472c581d7b85;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index 748ecb4..c50725b 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
@@ -13,6 +6,8 @@ Distributed under the LGPL
 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
@@ -23,12 +18,15 @@ 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 &);
@@ -36,52 +34,25 @@ public:
 	};
 
 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();
-	};
-
-	Widget *pointer_focus;
-	bool pointer_grabbed;
-	Widget *input_focus;
+	Layout *layout;
 
 	Panel(const Panel &);
 	Panel &operator=(const Panel &);
 public:
 	Panel();
+	virtual ~Panel();
 
 	virtual const char *get_class() const { return "panel"; }
 
-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 set_layout(Layout *);
+	virtual void autosize();
 
 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);
-	virtual void pointer_leave();
-	virtual void key_press(unsigned, unsigned, wchar_t);
-	virtual void key_release(unsigned, unsigned);
-	virtual void focus_out();
+	virtual void render_special(const Part &, GL::Renderer &) const;
 
-protected:
-	void set_pointer_focus(Widget *);
-	void set_input_focus(Widget *);
+	virtual void on_geometry_change();
+	virtual void on_child_added(Widget &);
+	virtual void on_child_removed(Widget &);
 };
 
 } // namespace GLtk