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

diff --git a/source/widget.h b/source/widget.h
index feed5b7..ce88c97 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -15,7 +15,7 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-class Panel;
+class Container;
 class Part;
 class Resources;
 class Style;
@@ -41,6 +41,12 @@ public:
 		void style(const std::string &);
 	};
 
+	sigc::signal<void, bool> signal_visibility_changed;
+	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;
@@ -48,30 +54,37 @@ protected:
 	const Style *style;
 	State state;
 	bool visible;
-	Panel *parent;
+	Container *parent;
+	std::string tooltip;
 
 	Widget(const Resources &);
 public:
 	virtual ~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; }
 
 	/**
 	Sets the widget style.  The final style name is constructed by concatenating
 	the widget class and the style name with a dash.
 	*/
 	void set_style(const std::string &);
+	const Style &get_style() const { return *style; }
 
-	void set_visible(bool);
+	void set_tooltip(const std::string &);
+	const std::string &get_tooltip() const { return tooltip; }
 
-	const Geometry &get_geometry() const { return geom; }
+	void set_visible(bool);
 	bool is_visible() const { return visible; }
+	void set_focus();
 
 	void render() const;
 protected:
-	void render_graphic(const Part &) const;
-	void render_text(const Part &, const std::string &) const;
+	/*void render_graphic(const Part &) const;
+	void render_text(const Part &, const std::string &) const;*/
 	virtual void render_special(const Part &) const { }
 
 public:
@@ -79,12 +92,12 @@ public:
 	virtual void button_press(int, int, unsigned) { }
 	virtual void button_release(int, int, unsigned) { }
 	virtual void pointer_motion(int, int) { }
-	virtual void pointer_enter() { }
-	virtual void pointer_leave() { }
+	virtual void pointer_enter();
+	virtual void pointer_leave();
 	virtual void key_press(unsigned, unsigned, wchar_t) { }
 	virtual void key_release(unsigned, unsigned) { }
-	virtual void focus_in() { }
-	virtual void focus_out() { }
+	virtual void focus_in();
+	virtual void focus_out();
 
 protected:
 	/**
@@ -100,14 +113,19 @@ protected:
 
 	/**
 	Sets the widget's parent Panel.  The widget must be unparented when calling
-	this function.
+	this function with a nonzero parameter.
 	*/
-	void set_parent(Panel *);
+	void set_parent(Container *);
 
 	/**
 	A helper function to set the parent of another widget.
 	*/
-	void set_parent(Widget &, Panel *);
+	void set_parent(Widget &, Container *);
+
+	// More events
+	virtual void on_geometry_change() { }
+	virtual void on_style_change() { }
+	virtual void on_reparent() { }
 };
 
 } // namespace GLtk