X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86d2c8099a6a103fa070e657d82082f24a196575..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/cursor.h?ds=sidebyside

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f86aa818d2..66d8899419 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -14,23 +14,56 @@
 
 #include "wx/defs.h"
 
-#if defined(__WXPALMOS__)
-    #include "wx/palmos/cursor.h"
-#elif defined(__WXMSW__)
+/*
+    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(__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__)
+    #ifdef __WINDOWS__
+        #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #else
+        #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+    #endif
     #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__)
-    #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   wxBITMAP_TYPE_MACCURSOR_RESOURCE
     #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
     #include "wx/os2/cursor.h"
 #endif