X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7520f3da332d64a676b6f7d27a56004fabf2db36..d07f2e19181bc5caf29eb2338ce513be6fa42405:/src/os2/icon.cpp?ds=inline diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index a8d7100033..bfef80f19c 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -16,20 +16,19 @@ #pragma hdrstop #endif +#include "wx/icon.h" + #ifndef WX_PRECOMP #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/icon.h" #include "wx/log.h" #endif #include "wx/os2/private.h" #include "assert.h" -#include "wx/icon.h" - - IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) // ============================================================================ // implementation @@ -62,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) @@ -86,9 +85,7 @@ wxIcon::~wxIcon() { } -void wxIcon::CreateIconFromXpm( - const char** ppData -) +void wxIcon::CreateIconFromXpm(const char* const* ppData) { wxBitmap vBmp(ppData); @@ -260,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 ) {