X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..94a1ccb9cd421f67737d20062817846ab9fd1f4a:/include/wx/os2/icon.h diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 5ccf5424a0..d289bc0f4c 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -46,10 +46,10 @@ public: ); wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); } #ifdef wxNEEDS_CHARPP - wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); } + wxIcon(char** ppData) { CreateIconFromXpm(const_cast(ppData)); } #endif wxIcon( const wxString& rName - ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE + ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 ); @@ -61,7 +61,7 @@ public: virtual ~wxIcon(); bool LoadFile( const wxString& rName - ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE + ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 );