Generalized compilation fix for old compilers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index e84582519ecc1a1c5c979e5f8f8f3f48ca7ad2c5..e2dc786c5b2eceea3d041cc8212f679fd4093027 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -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 );
     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)
     {
     // needed for old GCC
     wxBitmap(char** data)
     {

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index ecf23e114475f606b2eedd2f8681f9c73b9a8317..0d50267688e6f9483d57dcab73541676bf776bc4 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -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 );
     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)
     {
     // needed for old GCC
     wxBitmap(char** data)
     {

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 3d5fc34156c7f2190a4402faf67174ca83ea00f3..695030e45388e855cb159615c278aa1d3e82d1aa 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -45,8 +45,7 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* data);
 
     // 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));
     wxBitmap(char** data)
     {
         *this = wxBitmap(wx_const_cast(const char* const*, data));

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index eeacd6e4c96b9a008bc4ba9895a732fb19c81a5f..552cbe22d9c94684dbb7fdbf63424aad60d6b35e 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -86,7 +86,7 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* bits);
 
     // Initialize with XPM data
     wxBitmap(const char* const* bits);

-#if defined (__GNUC__) && __GNUC__ < 3
+#ifdef wxNEEDS_CHARPP

     // needed for old GCC
     wxBitmap(char** data)
     {
     // needed for old GCC
     wxBitmap(char** data)
     {

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 71790c352dddbbc6c2dde920434ae8e19b3fe411..faeaf6fd204cf18c2571f805bec98aca9d8ce1d8 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -535,6 +535,10 @@
     #define wxCHECK_GCC_VERSION( major, minor ) 0
 #endif
 
     #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
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index d18be63a4e8932babe076bca4ba5098de63e7ca4..84e7f3ebc08d856fa633eb3468efa55a5d0b741b 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -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 );
     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)
     {
     // needed for old GCC
     wxBitmap(char** data)
     {