X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.h;h=20219c4d9d97db3ea9cf9fca5f574f69da5d3857;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=baa0ddc7123f5381e0208976b38b2d09b0375838;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/label.h b/source/label.h
index baa0ddc..20219c4 100644
--- a/source/label.h
+++ b/source/label.h
@@ -1,13 +1,14 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2011  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 {
@@ -23,19 +24,25 @@ public:
 	{
 	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"; }
+
+	virtual void autosize();
 	void set_text(const std::string &);
 
 private:
-	virtual const char *get_class() const { return "label"; }
 	virtual void render_special(const Part &) const;
+
+	virtual void on_style_change();
 };
 
 } // namespace GLtk