Add protected functions for manipulating widget state

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

diff --git a/source/widget.h b/source/widget.h
index 64db74e85a15d4b7f4a06fe5577a29140048966d..9bdc2c0e13eba4a24eca88e585b577a2a706e996 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_WIDGET_H_
 #define MSP_GLTK_WIDGET_H_
 
@@ -41,6 +34,7 @@ public:
        };
 
        sigc::signal<void, bool> signal_visibility_changed;
+       sigc::signal<void> signal_autosize_changed;
        sigc::signal<void> signal_request_focus;
        sigc::signal<void> signal_grab_pointer;
        sigc::signal<void> signal_ungrab_pointer;
@@ -66,7 +60,7 @@ public:
 
        void set_position(int, int);
        void set_size(unsigned, unsigned);
-       virtual void autosize() { }
+       virtual void autosize();
        void set_geometry(const Geometry &);
        const Geometry &get_geometry() const { return geom; }
 
@@ -76,8 +70,9 @@ protected:
        calling this function with a non-null parameter.
        */
        void set_parent(Container *);
-
 public:
+       Container *get_parent() const { return parent; }
+
        /**
        Sets the widget style.  The final style name is constructed by concatenating
        the widget class and the style name with a dash.
@@ -102,6 +97,12 @@ public:
        bool is_focusable() const { return focusable; }
        void set_focus();
 
+protected:
+       void set_state(State s) { set_state(s, s); }
+       void clear_state(State s) { set_state(s, NORMAL); }
+       void set_state(State, State);
+
+public:
        void render() const;
 protected:
        virtual void render_special(const Part &) const { }
@@ -113,8 +114,9 @@ public:
        virtual void pointer_motion(int, int) { }
        virtual void pointer_enter();
        virtual void pointer_leave();
-       virtual void key_press(unsigned, unsigned, wchar_t) { }
+       virtual void key_press(unsigned, unsigned) { }
        virtual void key_release(unsigned, unsigned) { }
+       virtual void character(wchar_t) { }
        virtual void focus_in();
        virtual void focus_out();
 protected: