X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e45080c10b11190028e843b617564caec95e82dd..af04373873ab51e9c0c41139716c66395a55ffcb:/src/os2/icon.cpp diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index a25b0fb21d..3d1a4cc723 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/09/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -61,7 +60,7 @@ wxIcon::wxIcon( const char WXUNUSED(bits)[], } wxIcon::wxIcon( const wxString& rIconFile, - long lFlags, + wxBitmapType lFlags, int nDesiredWidth, int nDesiredHeight ) :m_bIsXpm(false) @@ -257,7 +256,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 ) {