X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..80475016d1313e71db4c1ea9101bd505d9835bd2:/include/wx/xpmdecod.h

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index b3d0b0b140..e6e5b30d35 100644
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -12,6 +12,7 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_IMAGE && wxUSE_XPM
 
 class WXDLLIMPEXP_CORE wxImage;
 class WXDLLIMPEXP_BASE wxInputStream;
@@ -34,9 +35,14 @@ public:
     wxImage ReadFile(wxInputStream& stream);
 #endif
     // Read directly from XPM data (as passed to wxBitmap ctor):
-    wxImage ReadData(const char **xpm_data);
+    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
 
-#endif  // _WX_GIFDECOD_H_
+#endif  // _WX_XPM_H_