introduced wxICON_DEFAULT_TYPE and wxBITMAP_DEFAULT_TYPE; documented these default argument values; matched the wxBitmap and wxIcon interfaces to their real implementations; revised icon.h interface header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -97,7 +97,7 @@ public:
|
||||
|
||||
// Load a resource
|
||||
wxBitmap( int nId
|
||||
,wxBitmapType lType = wxBITMAP_TYPE_BMP_RESOURCE
|
||||
,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE
|
||||
);
|
||||
|
||||
// For compatiability with other ports, under OS/2 does same as default ctor
|
||||
@@ -161,10 +161,10 @@ public:
|
||||
,int nDepth = 1
|
||||
);
|
||||
virtual bool LoadFile( int nId
|
||||
,wxBitmapType lType = wxBITMAP_TYPE_BMP_RESOURCE
|
||||
,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE
|
||||
);
|
||||
virtual bool LoadFile( const wxString& rName
|
||||
,wxBitmapType lType = wxBITMAP_TYPE_XPM
|
||||
,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE
|
||||
);
|
||||
virtual bool SaveFile( const wxString& rName
|
||||
,wxBitmapType lType
|
||||
|
Reference in New Issue
Block a user