X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f7b34a878bbcb2f71a0c7694e2a3bec51460218..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/mgl/icon.h?ds=sidebyside diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h index 620ddbb4ec..ca3007a15b 100644 --- a/include/wx/mgl/icon.h +++ b/include/wx/mgl/icon.h @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,9 +39,9 @@ public: // For compatibility with wxMSW where desired size is sometimes required to // distinguish between multiple icons in a resource. - wxIcon(const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE, + wxIcon(const wxString& filename, int type = wxBITMAP_TYPE_ICO_RESOURCE, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) : - wxBitmap(filename, type) {} + wxBitmap(filename, (wxBitmapType)type) {} wxIcon& operator = (const wxIcon& icon); inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }