X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.h;h=e3cff690005fd358a24b8088a7dc902701d96dbd;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=0bd326f7a1aa054b40551282ef329f92ab6d627f;hpb=1fde94c15fc65e85f5931a9daf74dd8806e682e0;p=libs%2Fgltk.git

diff --git a/source/label.h b/source/label.h
index 0bd326f..e3cff69 100644
--- 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 "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -19,23 +13,29 @@ Labels display static text.  There is one special part: "text".
 class Label: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Label, Widget::Loader>
 	{
 	public:
 		Loader(Label &);
-		Label &get_object();
+	private:
+		void text(const std::string &);
 	};
 
 private:
-	std::string text;
+	Text text;
 
 public:
-	Label(const Resources &, const std::string & =std::string());
+	Label(const std::string & = std::string());
+
+	virtual const char *get_class() const { return "label"; }
+
 	void set_text(const std::string &);
 
 private:
-	virtual const char *get_class() const { return "label"; }
-	virtual void render_part(const Part &) const;
+	virtual void autosize_special(const Part &, Geometry &) const;
+	virtual void rebuild_special(const Part &);
+
+	virtual void on_style_change();
 };
 
 } // namespace GLtk