X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5c2d5262df98e197736d81d8a9fe54d1932ab0..d0f063020e6fb1b1a660952d0844071e0df24324:/include/wx/os2/icon.h?ds=sidebyside diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 7ed62517f6..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 - ,wxBitmapType 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 - ,wxBitmapType lFlags = wxBITMAP_TYPE_ICO_RESOURCE + ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 );