fixed arguments to make it wxMSW compatible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -41,7 +41,7 @@ public:
|
|||||||
inline wxIcon(const wxIcon& icon) { Ref(icon); }
|
inline wxIcon(const wxIcon& icon) { Ref(icon); }
|
||||||
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
|
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
|
||||||
|
|
||||||
wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
|
wxIcon( char **bits, int width=-1, int height=-1 ) :
|
||||||
wxBitmap( bits ) {};
|
wxBitmap( bits ) {};
|
||||||
|
|
||||||
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
|
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
|
||||||
|
@@ -41,7 +41,7 @@ public:
|
|||||||
inline wxIcon(const wxIcon& icon) { Ref(icon); }
|
inline wxIcon(const wxIcon& icon) { Ref(icon); }
|
||||||
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
|
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
|
||||||
|
|
||||||
wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
|
wxIcon( char **bits, int width=-1, int height=-1 ) :
|
||||||
wxBitmap( bits ) {};
|
wxBitmap( bits ) {};
|
||||||
|
|
||||||
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
|
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
|
||||||
|
Reference in New Issue
Block a user