complete rev55777 with some icon.h modifications which I missed in the first place

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-09-21 21:09:36 +00:00
parent e912ebe39f
commit c48d0d37c2
4 changed files with 26 additions and 31 deletions

View File

@@ -49,7 +49,7 @@ public:
wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); }
#endif
wxIcon( const wxString& rName
,wxBitmapType lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,wxBitmapType lFlags = wxICON_DEFAULT_TYPE
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
@@ -61,7 +61,7 @@ public:
virtual ~wxIcon();
bool LoadFile( const wxString& rName
,wxBitmapType lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,wxBitmapType lFlags = wxICON_DEFAULT_TYPE
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);