Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index df2c381ca1d00ff1c6e90217e8ad254ca51633a0..54209f0b197793119273cee2fc46447f1e4011c7 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      $Id$
 // Copyright:   (c) David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +26,7 @@ protected:
     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)
@@ -39,14 +38,13 @@ class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
 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);
 
-    wxCursor(wxStockCursor 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!
@@ -55,6 +53,8 @@ public:
 
     WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; }
 
+private:
+    void InitFromStock(wxStockCursor);
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };