X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86d2c8099a6a103fa070e657d82082f24a196575..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/cursor.h?ds=sidebyside diff --git a/include/wx/cursor.h b/include/wx/cursor.h index f86aa818d2..ad1b032752 100644 --- a/include/wx/cursor.h +++ b/include/wx/cursor.h @@ -14,23 +14,58 @@ #include "wx/defs.h" +/* + wxCursor classes should have the following public API: + +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject +{ +public: + wxCursor(); + wxCursor(const wxImage& image); + wxCursor(const wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif + virtual ~wxCursor(); +}; + +*/ + #if defined(__WXPALMOS__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/palmos/cursor.h" #elif defined(__WXMSW__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/msw/cursor.h" #elif defined(__WXMOTIF__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XBM #include "wx/motif/cursor.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/gtk/cursor.h" +#elif defined(__WXGTK__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/gtk1/cursor.h" #elif defined(__WXX11__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/x11/cursor.h" #elif defined(__WXMGL__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/mgl/cursor.h" +#elif defined(__WXDFB__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #include "wx/dfb/cursor.h" #elif defined(__WXMAC__) - #include "wx/mac/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE + #include "wx/osx/cursor.h" #elif defined(__WXCOCOA__) + #define wxCURSOR_DEFAULT_TYPE 0 #include "wx/cocoa/cursor.h" #elif defined(__WXPM__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/os2/cursor.h" #endif