X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add53a47066780852fabe9c1b7611352a39fa20..af01f1ba0d697c07173f436ab661b4c833258a91:/include/wx/os2/icon.h?ds=sidebyside diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 383fd39e16..22160f236a 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -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)