- a few minor bug fixes related to code warnings

- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
This commit is contained in:
Mark Vejvoda
2013-11-19 06:14:06 +00:00
parent 642a26bdb5
commit 9268aaf279
81 changed files with 675 additions and 626 deletions

View File

@@ -47,6 +47,16 @@ protected:
SDL_Surface *icon;
SDL_Surface *screen;
public:
// Example values:
// DEFAULT_CHARSET (English) = 1
// GB2312_CHARSET (Chinese) = 134
#ifdef WIN32
static DWORD charSet;
#else
static int charSet;
#endif
public:
PlatformContextGl();
virtual ~PlatformContextGl();
@@ -68,15 +78,6 @@ public:
// Global Fcs
// =====================================================
// Example values:
// DEFAULT_CHARSET (English) = 1
// GB2312_CHARSET (Chinese) = 134
#ifdef WIN32
static DWORD charSet = DEFAULT_CHARSET;
#else
static int charSet = 1;
#endif
#if defined(__APPLE__)
void createGlFontBitmaps(uint32 &base, const string &type, int size, int width, int charCount, FontMetrics &metrics);
void createGlFontOutlines(uint32 &base, const string &type, int width, float depth, int charCount, FontMetrics &metrics);