Compilation fix for old GCC versions.

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index b6b32df260cdc8bca0bcfb8ac79c38682d57d218..1aadd87f6d9b6e48d0519eb6ab089e6360bb5ea5 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -54,6 +54,13 @@ 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
+    // needed for old GCC
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif

     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 437771e18678e80e20c5e9a184ccc0c816a4bab5..18e2f40f19293fb4d88ca5933d051ea39e2303fc 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -68,6 +68,13 @@ 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
+    // needed for old GCC
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif

     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 3a40de04cc6225d6a54f173cbc049367ac6b21f0..8c73d46b290a25d327f2f5e3669fe78bbcde5c0e 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -45,7 +45,7 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* data);
 
     // Initialize with XPM data
     wxBitmap(const char* const* data);

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

     // needed for Borland 5.5
     wxBitmap(char** data)
     {
     // needed for Borland 5.5
     wxBitmap(char** data)
     {

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index a809df37ad622bda7bc2028ee88e6efb6669d6d9..b19a965bd9b3ecb2b5b0ad511b86cb9408882f69 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -85,6 +85,13 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* bits);
 
     // Initialize with XPM data
     wxBitmap(const char* const* bits);

+#if defined (__GNUC__) && __GNUC__ < 3
+    // needed for old GCC
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif

 
     // Load a resource
     wxBitmap( int             nId
 
     // Load a resource
     wxBitmap( int             nId

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 8ad40183ff89c38983bb6ace32dbaaa3daa21bfb..9cf858f8935892dbeacda2e83e8036761e7ad602 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -74,6 +74,13 @@ 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
+    // needed for old GCC
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif

     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();
 
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();