fix for Borland 5.5

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 40418fdc5fd95a77ed53c019acea843d3280f711..21e322bf2cf71ac8eb4dd407c0775c08f159a160 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -210,6 +210,11 @@ public:
     bool Create( int width, int height, unsigned char* data, bool static_data = false );
     bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
     bool Create( const char* const* xpmData );
+#ifdef __BORLANDC__
+    // needed for Borland 5.5
+    wxImage( char** xpmData ) { Create(wx_const_cast(const char* const*, xpmData)); }
+    bool Create( char** xpmData ) { return Create(wx_const_cast(const char* const*, xpmData)); }
+#endif
     void Destroy();
 
     // creates an identical copy of the image (the = operator

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index b176f616e5a6f642dcfa09d86bf9422d2e117c06..3a40de04cc6225d6a54f173cbc049367ac6b21f0 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -45,6 +45,13 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* data);
+#ifdef __BORLANDC__
+    // needed for Borland 5.5
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif
 
     // Load a file or resource
     wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 96cdab77323f1e0cc7e8367252d806558544e8bc..e6e5b30d35524010d21da6d1594fd810f60ff900 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -36,6 +36,10 @@ public:
 #endif
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadData(const char* const* xpm_data);
+#ifdef __BORLANDC__
+    // needed for Borland 5.5
+    wxImage ReadData(char** xpm_data) { return ReadData(wx_const_cast(const char* const*, xpm_data)); }
+#endif
 };
 
 #endif // wxUSE_IMAGE && wxUSE_XPM