X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=64db74e85a15d4b7f4a06fe5577a29140048966d;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=ce88c97d4e65921b6c044bdea79f79a12dd3c11c;hpb=1e06dc208a02e68cf1bb127927e3ad5af3657c58;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index ce88c97..64db74e 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #define MSP_GLTK_WIDGET_H_
 
 #include <string>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 #include "state.h"
 
@@ -26,15 +27,13 @@ constructor, because it can't be done correctly in the Widget constructor.
 */
 class Widget
 {
+	friend class Container;
+
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Widget>
 	{
-	protected:
-		Widget &wdg;
-
 	public:
 		Loader(Widget &);
-		Widget &get_object() const { return wdg; }
 	private:
 		void position(int, int);
 		void size(unsigned, unsigned);
@@ -45,28 +44,40 @@ public:
 	sigc::signal<void> signal_request_focus;
 	sigc::signal<void> signal_grab_pointer;
 	sigc::signal<void> signal_ungrab_pointer;
-	sigc::signal<void> signal_request_raise;
 
 protected:
-	const Resources &res;
 	Geometry geom;
 	std::string style_name;
 	const Style *style;
 	State state;
 	bool visible;
+	bool focusable;
 	Container *parent;
 	std::string tooltip;
 
-	Widget(const Resources &);
+	Widget();
 public:
 	virtual ~Widget();
 
+	/**
+	Returns the name of the widget class.  Used for style lookup.
+	*/
+	virtual const char *get_class() const { return "widget"; }
+
 	void set_position(int, int);
 	void set_size(unsigned, unsigned);
 	virtual void autosize() { }
 	void set_geometry(const Geometry &);
 	const Geometry &get_geometry() const { return geom; }
 
+protected:
+	/**
+	Sets the widget's parent Container.  The widget must be unparented when
+	calling this function with a non-null parameter.
+	*/
+	void set_parent(Container *);
+
+public:
 	/**
 	Sets the widget style.  The final style name is constructed by concatenating
 	the widget class and the style name with a dash.
@@ -74,17 +85,25 @@ public:
 	void set_style(const std::string &);
 	const Style &get_style() const { return *style; }
 
+protected:
+	/**
+	Gets a style object from the resource collection based on the class and
+	style names of the widget.
+	*/
+	void update_style();
+
+public:
 	void set_tooltip(const std::string &);
 	const std::string &get_tooltip() const { return tooltip; }
 
 	void set_visible(bool);
 	bool is_visible() const { return visible; }
+	void set_focusable(bool);
+	bool is_focusable() const { return focusable; }
 	void set_focus();
 
 	void render() const;
 protected:
-	/*void render_graphic(const Part &) const;
-	void render_text(const Part &, const std::string &) const;*/
 	virtual void render_special(const Part &) const { }
 
 public:
@@ -98,31 +117,7 @@ public:
 	virtual void key_release(unsigned, unsigned) { }
 	virtual void focus_in();
 	virtual void focus_out();
-
 protected:
-	/**
-	Returns the name of the widget class.  Used for style lookup.
-	*/
-	virtual const char *get_class() const { return "widget"; }
-
-	/**
-	Gets a style object from the resource collection based on the class and
-	style names of the widget.
-	*/
-	void update_style();
-
-	/**
-	Sets the widget's parent Panel.  The widget must be unparented when calling
-	this function with a nonzero parameter.
-	*/
-	void set_parent(Container *);
-
-	/**
-	A helper function to set the parent of another widget.
-	*/
-	void set_parent(Widget &, Container *);
-
-	// More events
 	virtual void on_geometry_change() { }
 	virtual void on_style_change() { }
 	virtual void on_reparent() { }