support retina display

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

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index eb220b9fa7007201e49627197fa2f21466e25b4b..e3b3f09ca527e18db77e2cd83d685be15014cb35 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -27,7 +27,7 @@ protected:
     friend class WXDLLIMPEXP_FWD_CORE wxBitmap;
     friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 
     friend class WXDLLIMPEXP_FWD_CORE wxBitmap;
     friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 

-    DECLARE_NO_COPY_CLASS(wxCursorRefData)
+    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -39,14 +39,13 @@ class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
 public:
     wxCursor();
 
 public:
     wxCursor();
 

-    wxCursor(const char bits[], int width, int height,
-             int hotSpotX = -1, int hotSpotY = -1,
-             const char maskBits[] = NULL);
-
-    wxCursor(const wxString& name, long flags = 0,
+    wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE,

              int hotSpotX = 0, int hotSpotY = 0);
 
              int hotSpotX = 0, int hotSpotY = 0);
 

-    wxCursor(int cursor_type);
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif

     virtual ~wxCursor();
 
     // FIXME: operator==() is wrong!
     virtual ~wxCursor();
 
     // FIXME: operator==() is wrong!


@@ -55,6 +54,8 @@ public:
 
     WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; }
 
 
     WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; }
 

+private:
+    void InitFromStock(wxStockCursor);

     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };