X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.h;h=f688d4936d90d6354a56d07bac9163da74b52ccb;hb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;hp=850e9fb6f8c65d19222fe171eb6c463a615f303d;hpb=70c409d5ae005b96f89d47da49f868e65b4e5734;p=libs%2Fgltk.git

diff --git a/source/text.h b/source/text.h
index 850e9fb..f688d49 100644
--- a/source/text.h
+++ b/source/text.h
@@ -1,21 +1,16 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_TEXT_H_
 #define MSP_GLTK_TEXT_H_
 
 #include <string>
 #include <vector>
+#include "state.h"
 
 namespace Msp {
 namespace GLtk {
 
 class Geometry;
 class Part;
+class PartCache;
 class Style;
 
 /**
@@ -46,6 +41,7 @@ public:
 
 	unsigned get_width() const;
 	unsigned get_height() const;
+	void autosize(const Part &, Geometry &) const;
 
 	void set(const std::string &);
 	void erase(unsigned, unsigned);
@@ -58,7 +54,8 @@ public:
 	unsigned coords_to_offset(unsigned, unsigned) const;
 	Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
 
-	void render(const Part &, const Geometry &, unsigned = 0) const;
+	void build(const Part &, State, const Geometry &, PartCache &) const;
+	void build(const Part &, State, const Geometry &, unsigned, PartCache &) const;
 
 	Text &operator=(const std::string &);
 private:
@@ -67,7 +64,7 @@ private:
 	template<typename T, void (Text::*)(unsigned, const Geometry &, T &) const>
 	void process_lines(const Part &, const Geometry &, unsigned, T &) const;
 
-	void render_line(unsigned, const Geometry &, RenderData &) const;
+	void build_line(unsigned, const Geometry &, RenderData &) const;
 	void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;
 };