X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b729ceb23d24fecd17f47cc3c20fb3f62839ac36..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/mac/icon.h diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h index e24b58316e..e1aa18fea5 100644 --- a/include/wx/mac/icon.h +++ b/include/wx/mac/icon.h @@ -27,18 +27,20 @@ public: wxIcon(); // Copy constructors - inline wxIcon(const wxIcon& icon) { Ref(icon); } + wxIcon(const wxIcon& icon) + : wxBitmap() + { Ref(icon); } wxIcon(const char **data); wxIcon(char **data); wxIcon(const char bits[], int width , int height ); - wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICON_RESOURCE, + wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); ~wxIcon(); - bool LoadFile(const wxString& name, long flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , + bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); - bool LoadFile(const wxString& name ,long flags = wxBITMAP_TYPE_ICON_RESOURCE ) + bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE ) { return LoadFile( name , flags , -1 , -1 ) ; } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }