provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all ports except gtk,motif; make all ports emit wxLogError on invalid bitmap types; implement wxCursor(const wxString&, ...) ctor on GTK (not tested yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,25 +34,22 @@ public:
|
||||
|
||||
wxCursor(const wxImage& rImage);
|
||||
|
||||
wxCursor( const char acBits[]
|
||||
,int nWidth
|
||||
,int nHeight
|
||||
,int nHotSpotX = -1
|
||||
,int nHotSpotY = -1
|
||||
,const char zMaskBits[] = NULL
|
||||
);
|
||||
wxCursor( const wxString& rsName
|
||||
,long lFlags = wxBITMAP_TYPE_CUR_RESOURCE
|
||||
,wxBitmapType lType = wxCURSOR_DEFAULT_TYPE
|
||||
,int nHotSpotX = 0
|
||||
,int nHotSpotY = 0
|
||||
);
|
||||
wxCursor(wxStockCursor nCursorType);
|
||||
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
wxCursor(int id) { InitFromStock((wxStockCursor)id); }
|
||||
#endif
|
||||
inline ~wxCursor() { }
|
||||
|
||||
inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
|
||||
inline void SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
|
||||
|
||||
protected:
|
||||
void InitFromStock(wxStockCursor);
|
||||
inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user