Bitmap and icon updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-01-29 05:46:06 +00:00
parent a559d70856
commit 8bb6da4ae6
5 changed files with 53 additions and 21 deletions

View File

@@ -59,6 +59,8 @@ public:
,int nWidth
,int nHeight
);
inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }
wxIcon( const wxString& rName
,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,int nDesiredWidth = -1
@@ -84,11 +86,13 @@ public:
inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
void CopyFromBitmap(const wxBitmap& rBmp);
protected:
virtual wxGDIImageRefData* CreateData() const
{
return new wxIconRefData;
}
void CreateIconFromXpm(const char **ppData);
private:
DECLARE_DYNAMIC_CLASS(wxIcon)