fix for Borland 5.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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, bool static_data = false );
|
||||||
bool Create( int width, int height, unsigned char* data, unsigned char* alpha, 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 );
|
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();
|
void Destroy();
|
||||||
|
|
||||||
// creates an identical copy of the image (the = operator
|
// creates an identical copy of the image (the = operator
|
||||||
|
@@ -45,6 +45,13 @@ public:
|
|||||||
|
|
||||||
// Initialize with XPM data
|
// Initialize with XPM data
|
||||||
wxBitmap(const char* const* 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
|
// Load a file or resource
|
||||||
wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
|
wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
|
||||||
|
@@ -36,6 +36,10 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
// Read directly from XPM data (as passed to wxBitmap ctor):
|
// Read directly from XPM data (as passed to wxBitmap ctor):
|
||||||
wxImage ReadData(const char* const* 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 // wxUSE_IMAGE && wxUSE_XPM
|
||||||
|
Reference in New Issue
Block a user