X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/923d28da0eed674dfd7f4a497568ac14a29f0189..6c2cd2a2116c5eff1646e0acb7cad2c887300300:/src/os2/icon.cpp?ds=sidebyside diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index 7f2746b4a2..bfef80f19c 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -61,7 +61,7 @@ wxIcon::wxIcon( const char WXUNUSED(bits)[], } wxIcon::wxIcon( const wxString& rIconFile, - long lFlags, + wxBitmapType lFlags, int nDesiredWidth, int nDesiredHeight ) :m_bIsXpm(false) @@ -85,9 +85,7 @@ wxIcon::~wxIcon() { } -void wxIcon::CreateIconFromXpm( - const char** ppData -) +void wxIcon::CreateIconFromXpm(const char* const* ppData) { wxBitmap vBmp(ppData); @@ -259,7 +257,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& rBmp ) } // end of wxIcon::CopyFromBitmap bool wxIcon::LoadFile( const wxString& rFilename, - long lType, + wxBitmapType lType, int nDesiredWidth, int nDesiredHeight ) {