Use DerivedObjectLoader for widget loaders

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

diff --git a/source/panel.h b/source/panel.h
index a5483c452c57f7b0d639511878fb8a8ef2f4b8d6..aa94ff317f1402ed6c42a1d360dc1a2e2adbf2af 100644 (file)
--- a/source/panel.h
+++ b/source/panel.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_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
@@ -23,13 +16,12 @@ ignored.
 class Panel: public Container
 {
 public:
-       class Loader: public Widget::Loader
+       class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
        {
        public:
                typedef std::map<std::string, Widget *> WidgetMap;
 
        private:
-               Panel &pnl;
                WidgetMap &wdg_map;
        
        public:
@@ -41,23 +33,7 @@ public:
        };
 
 protected:
-       struct Child: public Container::Child
-       {
-               Child(Panel &, Widget *);
-               virtual ~Child();
-
-               void visibility_changed(bool);
-               void autosize_changed();
-               void request_focus();
-               void grab_pointer();
-               void ungrab_pointer();
-               void raise();
-       };
-
        Layout *layout;
-       Widget *pointer_focus;
-       bool pointer_grabbed;
-       Widget *input_focus;
 
        Panel(const Panel &);
        Panel &operator=(const Panel &);
@@ -68,32 +44,14 @@ public:
        virtual const char *get_class() const { return "panel"; }
 
        void set_layout(Layout *);
+       virtual void autosize();
 
 protected:
-       virtual Child *create_child(Widget *);
+       virtual void render_special(const Part &, GL::Renderer &) const;
 
-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);
-       virtual void pointer_leave();
-       virtual void key_press(unsigned, unsigned, wchar_t);
-       virtual void key_release(unsigned, unsigned);
-       virtual void focus_out();
-protected:
+       virtual void on_geometry_change();
        virtual void on_child_added(Widget &);
        virtual void on_child_removed(Widget &);
-
-       void set_pointer_focus(Widget *);
-       void set_input_focus(Widget *);
 };
 
 } // namespace GLtk