*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-08-02 04:44:01 +00:00
parent 4d194d6368
commit 54da4255a2
37 changed files with 1018 additions and 1078 deletions

View File

@@ -49,8 +49,6 @@ public:
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( char **bits, int width=-1, int height=-1 );
~wxIcon();
bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
@@ -68,9 +66,11 @@ public:
/* TODO */
virtual bool Ok() const { return (m_refData != NULL) ; }
private:
// supress VisAge hiding warning
bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE)
{ return(wxBitmap::LoadFile(name, type)); }
// supress virtual function hiding warning
virtual bool LoadFile( const wxString& name
,long type = wxBITMAP_TYPE_BMP_RESOURCE
)
{ return(wxBitmap::LoadFile(name, type)); };
};
/* Example handlers. TODO: write your own handlers for relevant types.