AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generalized compilation fix for old compilers.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2006-11-01 01:16:01 +00:00
parent cd7ff8087b
commit 459f812bad
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/bitmap.h
View File

@ -54,7 +54,7 @@ public:
wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
#if defined (__GNUC__) && __GNUC__ < 3
#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{

2
include/wx/gtk1/bitmap.h
View File

@ -68,7 +68,7 @@ public:
wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
#if defined (__GNUC__) && __GNUC__ < 3
#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{

3
include/wx/msw/bitmap.h
View File

@ -45,8 +45,7 @@ public:
// Initialize with XPM data
wxBitmap(const char* const* data);
#if defined(__BORLANDC__) || (defined (__GNUC__) && __GNUC__ < 3)
// needed for Borland 5.5
#ifdef wxNEEDS_CHARPP
wxBitmap(char** data)
{
*this = wxBitmap(wx_const_cast(const char* const*, data));

2
include/wx/os2/bitmap.h
View File

@ -86,7 +86,7 @@ public:
// Initialize with XPM data
wxBitmap(const char* const* bits);
#if defined (__GNUC__) && __GNUC__ < 3
#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{

4
include/wx/platform.h
View File

@ -535,6 +535,10 @@
#define wxCHECK_GCC_VERSION( major, minor ) 0
#endif
#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
#define wxNEEDS_CHARPP
#endif
/*
This macro can be used to check that the version of mingw32 compiler is
at least maj.min

2
include/wx/x11/bitmap.h
View File

@ -74,7 +74,7 @@ public:
wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
#if defined (__GNUC__) && __GNUC__ < 3
#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{