X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=b431a854cdcc284ad751fa45e926ea082e274962;hb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;hp=e269ca21819748185e2574758b459f8c532fb4b5;hpb=1a5f227ac945bc9e6449d1552e5d9eb4c1c196fb;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index e269ca2..b431a85 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-2009  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,7 +18,7 @@ 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
@@ -36,22 +36,28 @@ public:
 	};
 
 private:
-	std::list<Widget *> children;
+	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;
-	unsigned pointer_grab;
+	bool pointer_grabbed;
 	Widget *input_focus;
 
 	Panel(const Panel &);
 	Panel &operator=(const Panel &);
 public:
 	Panel(const Resources &);
-	~Panel();
 
-	void add(Widget &);
-	void remove(Widget &);
-	const std::list<Widget *> &get_children() const { return children; }
 	void raise(Widget &);
-	void set_focus(Widget &);
 
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
@@ -60,19 +66,13 @@ public:
 	virtual void key_press(unsigned, unsigned, wchar_t);
 	virtual void key_release(unsigned, unsigned);
 	virtual void focus_out();
-
-	// These functions are not intended to be called from outside GLtk
-	void child_hidden(Widget &);
-	void grab_pointer(Widget &);
-	void ungrab_pointer(Widget &);
-	void grab_focus(Widget &);
 private:
 	virtual const char *get_class() const { return "panel"; }
 	virtual void render_special(const Part &) const;
+	virtual Child *create_child(Widget *);
 
-	void set_pointer_focus(Widget *, int);
+	void set_pointer_focus(Widget *);
 	void set_input_focus(Widget *);
-	Widget *get_child_at(int, int);
 };
 
 } // namespace GLtk