X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..0cd9bfe8dacee998429236912c831fd2472163a8:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index f7119fa44a..0711d68d85 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -45,12 +45,12 @@ public: inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon* icon) { /* UnRef(); */ if (icon) Ref(*icon); } - wxIcon(const char bits[], const int width, const int height); - wxIcon(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE, + wxIcon(const char bits[], int width, int height); + wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); ~wxIcon(void); - bool LoadFile(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE, + bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } @@ -78,7 +78,7 @@ public: m_type = wxBITMAP_TYPE_ICO; }; - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags, + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth = -1, int desiredHeight = -1); }; @@ -93,7 +93,7 @@ public: m_type = wxBITMAP_TYPE_ICO_RESOURCE; }; - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags, + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth = -1, int desiredHeight = -1); };