compilation fix for Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c35c7d01d4
commit
625e74a703
@ -39,9 +39,9 @@ public:
|
|||||||
|
|
||||||
// For compatibility with wxMSW where desired size is sometimes required to
|
// For compatibility with wxMSW where desired size is sometimes required to
|
||||||
// distinguish between multiple icons in a resource.
|
// 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 ) :
|
int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
|
||||||
wxBitmap(filename, type) {}
|
wxBitmap(filename, (wxBitmapType)type) {}
|
||||||
|
|
||||||
wxIcon& operator = (const wxIcon& icon);
|
wxIcon& operator = (const wxIcon& icon);
|
||||||
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
|
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
|
||||||
|
Loading…
Reference in New Issue
Block a user