Rework how widget ownership works in Container

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

diff --git a/source/label.h b/source/label.h
index 87835da73811a4a816cdadc11c746f6a416bc3ef..0fb09e928fa6ff2e8edad62214e70991432ec3b2 100644 (file)
--- a/source/label.h
+++ b/source/label.h
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_LABEL_H_
 #define MSP_GLTK_LABEL_H_
 
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -17,13 +11,14 @@ namespace GLtk {
 /**
 Labels display static text.  There is one special part: "text".
 */
-class Label: public Widget
+class MSPGLTK_API Label: public Widget
 {
 public:
-       class Loader: public Widget::Loader
+       class Loader: public DataFile::DerivedObjectLoader<Label, Widget::Loader>
        {
        public:
                Loader(Label &);
+
        private:
                void text(const std::string &);
        };
@@ -34,14 +29,15 @@ private:
 public:
        Label(const std::string & = std::string());
 
-       virtual void autosize();
+       const char *get_class() const override { return "label"; }
+
        void set_text(const std::string &);
 
 private:
-       virtual const char *get_class() const { return "label"; }
-       virtual void render_special(const Part &) const;
+       void autosize_special(const Part &, Geometry &) const override;
+       void rebuild_special(const Part &) override;
 
-       virtual void on_style_change();
+       void on_style_change() override;
 };
 
 } // namespace GLtk