X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=2fdc68c34c778e34f4ebf72ba237921eeb2f54fb;hb=ef4660c4bdf38e126e13b426649fc2f997027b65;hp=8cf67d439b7c7e2a27c2b360623d21b5aa607751;hpb=3f4817441626e1abb5556ae53c16746634a57ad9;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 8cf67d4..2fdc68c 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,11 @@ 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;
+
 protected:
 	const Resources &res;
 	Geometry geom;
@@ -48,14 +53,19 @@ protected:
 	const Style *style;
 	State state;
 	bool visible;
-	Panel *parent;
+	bool focusable;
+	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
@@ -64,16 +74,17 @@ public:
 	void set_style(const std::string &);
 	const Style &get_style() const { return *style; }
 
-	void set_visible(bool);
-	void set_focus();
+	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_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:
@@ -104,12 +115,12 @@ protected:
 	Sets the widget's parent Panel.  The widget must be unparented when calling
 	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() { }