Loader improvements

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

diff --git a/source/panel.h b/source/panel.h
index 1082447bc58fdddaf77f660d5876e326a5a82616..54e75ef5309e9e23d62645fadaf5064cafa7fddb 100644 (file)
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -23,12 +23,15 @@ class Panel: public Container
 public:
        class Loader: public Widget::Loader
        {
+       public:
+               typedef std::map<std::string, Widget *> WidgetMap;
+
        private:
                Panel &pnl;
-               std::map<std::string, Widget *> &wdg_map;
+               WidgetMap &wdg_map;
        
        public:
-               Loader(Panel &, std::map<std::string, Widget *> &);
+               Loader(Panel &, WidgetMap &);
        private:
                template<typename T>
                void child(const std::string &);
@@ -55,12 +58,22 @@ protected:
        Panel(const Panel &);
        Panel &operator=(const Panel &);
 public:
-       Panel(const Resources &);
+       Panel();
 
+       virtual const char *get_class() const { return "panel"; }
+
+protected:
+       virtual Child *create_child(Widget *);
+
+public:
        void raise(Widget &);
        Widget *get_input_focus() const { return input_focus; }
        Widget *get_final_input_focus() const;
 
+protected:
+       virtual void render_special(const Part &) const;
+
+public:
        virtual void button_press(int, int, unsigned);
        virtual void button_release(int, int, unsigned);
        virtual void pointer_motion(int, int);
@@ -68,11 +81,8 @@ public:
        virtual void key_press(unsigned, unsigned, wchar_t);
        virtual void key_release(unsigned, unsigned);
        virtual void focus_out();
-protected:
-       virtual const char *get_class() const { return "panel"; }
-       virtual void render_special(const Part &) const;
-       virtual Child *create_child(Widget *);
 
+protected:
        void set_pointer_focus(Widget *);
        void set_input_focus(Widget *);
 };