Reorder class members

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

diff --git a/source/widget.h b/source/widget.h
index 557df434adcd34f98d858324ab753e8271b9a1a5..255f0425bcc719f3161ccb32e8aaa3b75888d1e5 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef MSP_GLTK_WIDGET_H_
 #define MSP_GLTK_WIDGET_H_
 
@@ -12,6 +19,10 @@ class Part;
 class Resources;
 class Style;
 
+/**
+Base class for all widgets.  Derived classes should call update_style in 
+constructor, because it can't be done correctly in the Widget constructor.
+*/
 class Widget
 {
 public:
@@ -29,14 +40,38 @@ public:
                void style(const std::string &);
        };
 
+protected:
+       const Resources &res;
+       Geometry geom;
+       std::string style_name;
+       const Style *style;
+       State state;
+       bool visible;
+
+       Widget(const Resources &);
+public:
        virtual ~Widget() { }
        void set_position(int, int);
        void set_size(unsigned, unsigned);
        void set_geometry(const Geometry &);
+
+       /**
+       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 Geometry &get_geometry() const { return geom; }
        bool is_visible() const { return visible; }
+
        void render() const;
+protected:
+       virtual void render_part(const Part &) const;
+       void render_graphic(const Part &) const;
+       void render_text(const Part &, const std::string &) const;
+
+public:
+       // Events
        virtual void button_press(int, int, unsigned) { }
        virtual void button_release(int, int, unsigned) { }
        virtual void pointer_motion(int, int) { }
@@ -46,20 +81,14 @@ public:
        virtual void key_release(unsigned, unsigned) { }
        virtual void focus_in() { }
        virtual void focus_out() { }
-protected:
-       const Resources &res;
-       Geometry geom;
-       std::string style_name;
-       const Style *style;
-       State state;
-       bool visible;
 
-       Widget(const Resources &);
+protected:
+       /**
+       Returns the name of the widget class.  Used for style lookup.
+       */
        virtual const char *get_class() const { return "widget"; }
+
        void update_style();
-       virtual void render_part(const Part &) const;
-       void render_graphic(const Part &) const;
-       void render_text(const Part &, const std::string &) const;
 };
 
 } // namespace GLtk