typedef tweaks

[libs/gltk.git] / source / widget.h

diff --git a/source/widget.h b/source/widget.h
index a83cecc9bef8c14643cc4855faaeda1712ac603d..bc9b90a69696a8e944af0d88042ad318ab481ec1 100644 (file)
--- 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-2011  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;
@@ -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
        {
@@ -41,37 +43,70 @@ 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;
        std::string style_name;
        const Style *style;
        State state;
        bool visible;
-       Panel *parent;
+       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.
        */
        void set_style(const std::string &);
+       const Style &get_style() const { return *style; }
 
-       void set_visible(bool);
+protected:
+       /**
+       Gets a style object from the resource collection based on the class and
+       style names of the widget.
+       */
+       void update_style();
 
-       const Geometry &get_geometry() const { return geom; }
+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:
@@ -79,37 +114,13 @@ 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:
-       /**
-       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(Panel *);
-
-       /**
-       A helper function to set the parent of another widget.
-       */
-       void set_parent(Widget &, Panel *);
-
-       // More events
        virtual void on_geometry_change() { }
        virtual void on_style_change() { }
        virtual void on_reparent() { }