Slightly more efficient wxDataViewCtrl::StartEditor().

[wxWidgets.git] / include / wx / cursor.h

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f77ecc2a4e69e112ae1900c8d876ece9229e3233..ad1b0327523dca6e08e34d482b2fe7388fa65d7a 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -14,27 +14,58 @@
 
 #include "wx/defs.h"
 
 
 #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__)
 #if defined(__WXPALMOS__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE

     #include "wx/palmos/cursor.h"
 #elif defined(__WXMSW__)
     #include "wx/palmos/cursor.h"
 #elif defined(__WXMSW__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE

     #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
     #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XBM

     #include "wx/motif/cursor.h"
 #elif defined(__WXGTK20__)
     #include "wx/motif/cursor.h"
 #elif defined(__WXGTK20__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

     #include "wx/gtk/cursor.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/cursor.h"
 #elif defined(__WXGTK__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

     #include "wx/gtk1/cursor.h"
 #elif defined(__WXX11__)
     #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/x11/cursor.h"
 #elif defined(__WXMGL__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE

     #include "wx/mgl/cursor.h"
 #elif defined(__WXDFB__)
     #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/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__)
 #elif defined(__WXCOCOA__)

+    #define wxCURSOR_DEFAULT_TYPE   0

     #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
     #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)

+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE

     #include "wx/os2/cursor.h"
 #endif
 
     #include "wx/os2/cursor.h"
 #endif