FS#90 - Improve Unicode string classes

Added the sf::String class to replace (and enhance) sf::Unicode::Text FS#138 - Rename sf::String to sf::Text git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1286 4e206d99-4929-0410-ac5d-dfc041789085
ChrisThrasher · Nov 26, 2009 · 78247bd · 78247bd
1 parent 9f06392
commit 78247bd
Show file tree

Hide file tree

Showing 46 changed files with 3,003 additions and 1,725 deletions.
diff --git a/CSFML/build/VC2005/csfml-graphics.vcproj b/CSFML/build/VC2005/csfml-graphics.vcproj
@@ -318,15 +318,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\SFML\Graphics\String.cpp"
+			RelativePath="..\..\src\SFML\Graphics\Text.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\include\SFML\Graphics\String.h"
+			RelativePath="..\..\include\SFML\Graphics\Text.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\SFML\Graphics\StringStruct.h"
+			RelativePath="..\..\src\SFML\Graphics\TextStruct.h"
 			>
 		</File>
 		<File

diff --git a/CSFML/build/VC2008/csfml-graphics.vcproj b/CSFML/build/VC2008/csfml-graphics.vcproj
@@ -313,15 +313,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\SFML\Graphics\String.cpp"
+			RelativePath="..\..\src\SFML\Graphics\Text.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\include\SFML\Graphics\String.h"
+			RelativePath="..\..\include\SFML\Graphics\Text.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\SFML\Graphics\StringStruct.h"
+			RelativePath="..\..\src\SFML\Graphics\TextStruct.h"
 			>
 		</File>
 		<File

diff --git a/CSFML/build/codeblocks/csfml-graphics.cbp b/CSFML/build/codeblocks/csfml-graphics.cbp
@@ -59,32 +59,33 @@
 		<Unit filename="..\..\include\SFML\Graphics\Color.h" />
 		<Unit filename="..\..\include\SFML\Graphics\Font.h" />
 		<Unit filename="..\..\include\SFML\Graphics\Image.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Shader.h" />
 		<Unit filename="..\..\include\SFML\Graphics\Rect.h" />
 		<Unit filename="..\..\include\SFML\Graphics\RenderWindow.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Shader.h" />
 		<Unit filename="..\..\include\SFML\Graphics\Shape.h" />
 		<Unit filename="..\..\include\SFML\Graphics\Sprite.h" />
-		<Unit filename="..\..\include\SFML\Graphics\String.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Text.h" />
 		<Unit filename="..\..\include\SFML\Graphics\Types.h" />
 		<Unit filename="..\..\include\SFML\Graphics\View.h" />
 		<Unit filename="..\..\src\SFML\Graphics\Color.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\Font.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\FontStruct.h" />
 		<Unit filename="..\..\src\SFML\Graphics\Image.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\ImageStruct.h" />
-		<Unit filename="..\..\src\SFML\Graphics\Shader.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\ShaderStruct.h" />
 		<Unit filename="..\..\src\SFML\Graphics\Rect.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\RenderImage.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\RenderImageStruct.h" />
 		<Unit filename="..\..\src\SFML\Graphics\RenderWindow.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\RenderWindowStruct.h" />
+		<Unit filename="..\..\src\SFML\Graphics\Shader.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\ShaderStruct.h" />
 		<Unit filename="..\..\src\SFML\Graphics\Shape.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\ShapeStruct.h" />
 		<Unit filename="..\..\src\SFML\Graphics\Sprite.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\SpriteStruct.h" />
-		<Unit filename="..\..\src\SFML\Graphics\String.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\StringStruct.h" />
+		<Unit filename="..\..\src\SFML\Graphics\Text.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\TextStruct.h" />
 		<Unit filename="..\..\src\SFML\Graphics\View.cpp" />
 		<Unit filename="..\..\src\SFML\Graphics\ViewStruct.h" />
 		<Extensions>

diff --git a/CSFML/include/SFML/Graphics/RenderImage.h b/CSFML/include/SFML/Graphics/RenderImage.h
@@ -112,25 +112,25 @@ CSFML_API void sfRenderImage_Display(sfRenderImage* renderImage);
 ////////////////////////////////////////////////////////////
 /// Draw something on a renderimage
 ///
-/// \param renderImage :             Renderimage to draw in
-/// \param sprite / string / shape : Object to draw
+/// \param renderImage :           Renderimage to draw in
+/// \param sprite / text / shape : Object to draw
 ///
 ////////////////////////////////////////////////////////////
 CSFML_API void sfRenderImage_DrawSprite(sfRenderImage* renderImage, sfSprite* sprite);
 CSFML_API void sfRenderImage_DrawShape (sfRenderImage* renderImage, sfShape*  shape);
-CSFML_API void sfRenderImage_DrawString(sfRenderImage* renderImage, sfString* string);
+CSFML_API void sfRenderImage_DrawText  (sfRenderImage* renderImage, sfText*   text);
 
 ////////////////////////////////////////////////////////////
 /// Draw something on a renderimage with a shader
 ///
-/// \param renderImage :             Renderimage to draw in
-/// \param sprite / string / shape : Object to draw
-/// \param shader :                  Shader to use
+/// \param renderImage :           Renderimage to draw in
+/// \param sprite / text / shape : Object to draw
+/// \param shader :                Shader to use
 ///
 ////////////////////////////////////////////////////////////
 CSFML_API void sfRenderImage_DrawSpriteWithShader(sfRenderImage* renderImage, sfSprite* sprite, sfShader* shader);
 CSFML_API void sfRenderImage_DrawShapeWithShader (sfRenderImage* renderImage, sfShape*  shape,  sfShader* shader);
-CSFML_API void sfRenderImage_DrawStringWithShader(sfRenderImage* renderImage, sfString* string, sfShader* shader);
+CSFML_API void sfRenderImage_DrawTextWithShader  (sfRenderImage* renderImage, sfText*   text, sfShader* shader);
 
 ////////////////////////////////////////////////////////////
 /// Clear the renderimage with the given color

diff --git a/CSFML/include/SFML/Graphics/RenderWindow.h b/CSFML/include/SFML/Graphics/RenderWindow.h
@@ -292,25 +292,25 @@ CSFML_API void sfRenderWindow_SetJoystickThreshold(sfRenderWindow* renderWindow,
 ////////////////////////////////////////////////////////////
 /// Draw something on a renderwindow
 ///
-/// \param renderWindow :            Renderwindow to draw in
-/// \param sprite / string / shape : Object to draw
+/// \param renderWindow :          Renderwindow to draw in
+/// \param sprite / text / shape : Object to draw
 ///
 ////////////////////////////////////////////////////////////
 CSFML_API void sfRenderWindow_DrawSprite(sfRenderWindow* renderWindow, sfSprite* sprite);
 CSFML_API void sfRenderWindow_DrawShape (sfRenderWindow* renderWindow, sfShape*  shape);
-CSFML_API void sfRenderWindow_DrawString(sfRenderWindow* renderWindow, sfString* string);
+CSFML_API void sfRenderWindow_DrawText  (sfRenderWindow* renderWindow, sfText*   text);
 
 ////////////////////////////////////////////////////////////
 /// Draw something on a renderwindow with a shader
 ///
-/// \param renderWindow :            Renderwindow to draw in
-/// \param sprite / string / shape : Object to draw
-/// \param shader :                  Shader to use
+/// \param renderWindow :          Renderwindow to draw in
+/// \param sprite / text / shape : Object to draw
+/// \param shader :                Shader to use
 ///
 ////////////////////////////////////////////////////////////
 CSFML_API void sfRenderWindow_DrawSpriteWithShader(sfRenderWindow* renderWindow, sfSprite* sprite, sfShader* shader);
 CSFML_API void sfRenderWindow_DrawShapeWithShader (sfRenderWindow* renderWindow, sfShape*  shape,  sfShader* shader);
-CSFML_API void sfRenderWindow_DrawStringWithShader(sfRenderWindow* renderWindow, sfString* string, sfShader* shader);
+CSFML_API void sfRenderWindow_DrawTextWithShader  (sfRenderWindow* renderWindow, sfText*   text, sfShader* shader);
 
 ////////////////////////////////////////////////////////////
 /// Clear the screen with the given color