X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=bc9b90a69696a8e944af0d88042ad318ab481ec1;hb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;hp=d5bc0ff04c232504a657275b956b9f14c3ec36de;hpb=1c5148b7b63e1ba84073355702972caf6fe83b7e;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index d5bc0ff..bc9b90a 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
 */
 
@@ -26,6 +26,8 @@ constructor, because it can't be done correctly in the Widget constructor.
 */
 class Widget
 {
+	friend class Container;
+
 public:
 	class Loader: public Msp::DataFile::Loader
 	{
@@ -60,12 +62,25 @@ protected:
 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.
@@ -73,6 +88,14 @@ 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; }
 
@@ -97,33 +120,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();
-
-	static void update_style(Widget &);
-
-	/**
-	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.
-	*/
-	static void set_parent(Widget &, Container *);
-
-	// More events
 	virtual void on_geometry_change() { }
 	virtual void on_style_change() { }
 	virtual void on_reparent() { }