From acfc296150b97bd85a9b456a71e9433db09b373e Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Sun, 29 Nov 2009 10:06:34 +0000 Subject: [PATCH] Removed sfFont_Create() from CSFML Removed sfText_GetWidth() and sfFont_GetHeight() declarations from SFML.Net (these functions don't exist) git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1294 4e206d99-4929-0410-ac5d-dfc041789085 --- CSFML/include/SFML/Graphics/Font.h | 8 -------- CSFML/src/SFML/Graphics/Font.cpp | 9 --------- CSFML/src/SFML/Graphics/csfml-graphics-d.def | 1 - CSFML/src/SFML/Graphics/csfml-graphics.def | 1 - dotnet/src/Graphics/Font.cs | 3 --- dotnet/src/Graphics/Text.cs | 6 ------ 6 files changed, 28 deletions(-) diff --git a/CSFML/include/SFML/Graphics/Font.h b/CSFML/include/SFML/Graphics/Font.h index a9cb9776..16f76636 100644 --- a/CSFML/include/SFML/Graphics/Font.h +++ b/CSFML/include/SFML/Graphics/Font.h @@ -32,14 +32,6 @@ #include -//////////////////////////////////////////////////////////// -/// Create a new empty font -/// -/// \return A new sfFont object, or NULL if it failed -/// -//////////////////////////////////////////////////////////// -CSFML_API sfFont* sfFont_Create(); - //////////////////////////////////////////////////////////// /// Create a new font from a file /// diff --git a/CSFML/src/SFML/Graphics/Font.cpp b/CSFML/src/SFML/Graphics/Font.cpp index ac5909af..8e2b2207 100644 --- a/CSFML/src/SFML/Graphics/Font.cpp +++ b/CSFML/src/SFML/Graphics/Font.cpp @@ -30,15 +30,6 @@ #include -//////////////////////////////////////////////////////////// -/// Create a new empty font -//////////////////////////////////////////////////////////// -sfFont* sfFont_Create() -{ - return new sfFont; -} - - //////////////////////////////////////////////////////////// /// Create a new font from a file //////////////////////////////////////////////////////////// diff --git a/CSFML/src/SFML/Graphics/csfml-graphics-d.def b/CSFML/src/SFML/Graphics/csfml-graphics-d.def index 29c77510..f0643776 100644 --- a/CSFML/src/SFML/Graphics/csfml-graphics-d.def +++ b/CSFML/src/SFML/Graphics/csfml-graphics-d.def @@ -124,7 +124,6 @@ EXPORTS sfSprite_GetWidth sfSprite_GetHeight sfSprite_GetPixel - sfFont_Create sfFont_CreateFromFile sfFont_CreateFromMemory sfFont_Destroy diff --git a/CSFML/src/SFML/Graphics/csfml-graphics.def b/CSFML/src/SFML/Graphics/csfml-graphics.def index a7399110..049adbba 100644 --- a/CSFML/src/SFML/Graphics/csfml-graphics.def +++ b/CSFML/src/SFML/Graphics/csfml-graphics.def @@ -124,7 +124,6 @@ EXPORTS sfSprite_GetWidth sfSprite_GetHeight sfSprite_GetPixel - sfFont_Create sfFont_CreateFromFile sfFont_CreateFromMemory sfFont_Destroy diff --git a/dotnet/src/Graphics/Font.cs b/dotnet/src/Graphics/Font.cs index aba5a3b1..273d2d6c 100644 --- a/dotnet/src/Graphics/Font.cs +++ b/dotnet/src/Graphics/Font.cs @@ -187,9 +187,6 @@ namespace SFML private static Font ourDefaultFont = null; #region Imports - [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] - static extern IntPtr sfFont_Create(); - [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] static extern IntPtr sfFont_CreateFromFile(string Filename, uint CharSize, IntPtr Charset); diff --git a/dotnet/src/Graphics/Text.cs b/dotnet/src/Graphics/Text.cs index 61447d30..e686d394 100644 --- a/dotnet/src/Graphics/Text.cs +++ b/dotnet/src/Graphics/Text.cs @@ -369,12 +369,6 @@ namespace SFML [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] static extern void sfRenderImage_DrawTextWithShader(IntPtr This, IntPtr String, IntPtr Shader); - [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] - static extern float sfText_GetWidth(IntPtr This); - - [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] - static extern float sfText_GetHeight(IntPtr This); - [DllImport("csfml-graphics", CharSet = CharSet.Ansi), SuppressUnmanagedCodeSecurity] static extern void sfText_SetString(IntPtr This, string Text);