X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..08e827d82daf916a08d0eb0f12cb91d9061fa921:/include/wx/osx/carbon/icon.h diff --git a/include/wx/osx/carbon/icon.h b/include/wx/osx/carbon/icon.h index 754a5344c1..caa9a17d64 100644 --- a/include/wx/osx/carbon/icon.h +++ b/include/wx/osx/carbon/icon.h @@ -22,8 +22,8 @@ public: wxIcon(const char* const* data); wxIcon(const char bits[], int width , int height ); - wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE, - int desiredWidth = -1, int desiredHeight = -1); + wxIcon(const wxString& name, int flags = wxICON_DEFAULT_TYPE, + int desiredWidth = -1, int desiredHeight = -1); wxIcon(const wxIconLocation& loc) { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); @@ -33,10 +33,8 @@ public: virtual ~wxIcon(); - bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , - int desiredWidth /* = -1 */ , int desiredHeight = -1); - bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE ) - { return LoadFile( name , flags , -1 , -1 ) ; } + bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, + int desiredWidth = -1, int desiredHeight = -1); // create from bitmap (which should have a mask unless it's monochrome):