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

diff --git a/source/panel.h b/source/panel.h
index 748ecb4..b1261c3 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 &);
@@ -42,12 +40,14 @@ protected:
 		virtual ~Child();
 
 		void visibility_changed(bool);
+		void autosize_changed();
 		void request_focus();
 		void grab_pointer();
 		void ungrab_pointer();
 		void raise();
 	};
 
+	Layout *layout;
 	Widget *pointer_focus;
 	bool pointer_grabbed;
 	Widget *input_focus;
@@ -56,9 +56,12 @@ protected:
 	Panel &operator=(const Panel &);
 public:
 	Panel();
+	virtual ~Panel();
 
 	virtual const char *get_class() const { return "panel"; }
 
+	void set_layout(Layout *);
+
 protected:
 	virtual Child *create_child(Widget *);
 
@@ -75,11 +78,14 @@ public:
 	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_press(unsigned, unsigned);
 	virtual void key_release(unsigned, unsigned);
+	virtual void character(wchar_t);
 	virtual void focus_out();
-
 protected:
+	virtual void on_child_added(Widget &);
+	virtual void on_child_removed(Widget &);
+
 	void set_pointer_focus(Widget *);
 	void set_input_focus(Widget *);
 };