X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5c2d5262df98e197736d81d8a9fe54d1932ab0..0dd9646ea8b9e6f3a5fa8c42b6a4954cf8e3a48d:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 82639748f2..9915a6a14d 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -91,13 +91,13 @@ public: // needed for old GCC wxBitmap(char** data) { - *this = wxBitmap(wx_const_cast(const char* const*, data)); + *this = wxBitmap(const_cast(data)); } #endif // Load a resource wxBitmap( int nId - ,wxBitmapType lType = wxBITMAP_TYPE_BMP_RESOURCE + ,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE ); // For compatiability with other ports, under OS/2 does same as default ctor @@ -161,10 +161,10 @@ public: ,int nDepth = 1 ); virtual bool LoadFile( int nId - ,wxBitmapType lType = wxBITMAP_TYPE_BMP_RESOURCE + ,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE ); virtual bool LoadFile( const wxString& rName - ,wxBitmapType lType = wxBITMAP_TYPE_XPM + ,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE ); virtual bool SaveFile( const wxString& rName ,wxBitmapType lType