Commit 60120941 authored by gerstrong@gmail.com's avatar gerstrong@gmail.com

Removed obsolete dependencies

parent 3cc2c48a
...@@ -56,7 +56,7 @@ bool GsFont::CreateSurface(SDL_Color *Palette, Uint32 Flags, ...@@ -56,7 +56,7 @@ bool GsFont::CreateSurface(SDL_Color *Palette, Uint32 Flags,
/*
SDL_Surface *loadfromXPMData(const char **data, const SDL_PixelFormat *format, const Uint32 flags) SDL_Surface *loadfromXPMData(const char **data, const SDL_PixelFormat *format, const Uint32 flags)
{ {
int width, height, colors; int width, height, colors;
...@@ -145,8 +145,9 @@ SDL_Surface *loadfromXPMData(const char **data, const SDL_PixelFormat *format, c ...@@ -145,8 +145,9 @@ SDL_Surface *loadfromXPMData(const char **data, const SDL_PixelFormat *format, c
return sfc; return sfc;
} }
*/
/*
bool GsFont::loadAlternateFont() bool GsFont::loadAlternateFont()
{ {
// Use some if the blit surface settings so it will be shown correctly // Use some if the blit surface settings so it will be shown correctly
...@@ -160,9 +161,9 @@ bool GsFont::loadAlternateFont() ...@@ -160,9 +161,9 @@ bool GsFont::loadAlternateFont()
return true; return true;
} }
*/
/*
void GsFont::loadinternalFont(const char *pixmap[]) void GsFont::loadinternalFont(const char *pixmap[])
{ {
SDL_Surface *blit = gVideoDriver.getBlitSurface(); SDL_Surface *blit = gVideoDriver.getBlitSurface();
...@@ -207,7 +208,7 @@ void GsFont::loadinternalFont(const int size) ...@@ -207,7 +208,7 @@ void GsFont::loadinternalFont(const int size)
} }
} }
*/
void GsFont::tintColor( const Uint32 fgColor ) void GsFont::tintColor( const Uint32 fgColor )
......
...@@ -88,19 +88,19 @@ public: ...@@ -88,19 +88,19 @@ public:
* @brief loadAlternateFont This loads the internal font found in Alternatefont.xpm * @brief loadAlternateFont This loads the internal font found in Alternatefont.xpm
* @return true if it was sucessfully loaded, otherwise false * @return true if it was sucessfully loaded, otherwise false
*/ */
bool loadAlternateFont(); //bool loadAlternateFont();
/** /**
* @brief loadinternalFont Load embeeded Font map into the surface * @brief loadinternalFont Load embeeded Font map into the surface
* @param pixmap Static array of pixel information as XPM * @param pixmap Static array of pixel information as XPM
*/ */
void loadinternalFont(const char *pixmap[]); //void loadinternalFont(const char *pixmap[]);
/** /**
* @brief loadinternalFont * @brief loadinternalFont
* @param size use 1 for normal sized and 2 for doubled, which would load an alternate pixmap into the surface * @param size use 1 for normal sized and 2 for doubled, which would load an alternate pixmap into the surface
*/ */
void loadinternalFont(const int size); //void loadinternalFont(const int size);
/** /**
* @brief setWidthToCharacter This sets the width of the characters so the text is printed nicely. * @brief setWidthToCharacter This sets the width of the characters so the text is printed nicely.
......
...@@ -54,10 +54,9 @@ bool GsFontLegacy::CreateSurface(SDL_Color *Palette, Uint32 Flags, ...@@ -54,10 +54,9 @@ bool GsFontLegacy::CreateSurface(SDL_Color *Palette, Uint32 Flags,
} }
SDL_Surface *loadfromXPMData(const char **data,
const SDL_PixelFormat *format,
const Uint32 flags)
SDL_Surface *loadfromXPMData(const char **data, const SDL_PixelFormat *format, const Uint32 flags)
{ {
int width, height, colors; int width, height, colors;
......
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
#include <graphics/GsTexture.h> #include <graphics/GsTexture.h>
#include <graphics/GsSurface.h> #include <graphics/GsSurface.h>
#if defined(USE_SDL_TTF)
#include <graphics/GsTrueTypeFont.h> #include <graphics/GsTrueTypeFont.h>
#endif
class CGUIText : public GsControl class CGUIText : public GsControl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment