Correct sorting in wxDataViewTreeStore, fixes #11436, part II

[wxWidgets.git] / src / cocoa / cursor.mm

diff --git a/src/cocoa/cursor.mm b/src/cocoa/cursor.mm
index 126ef111aa8e521de6945f1d0cea00f228cb5b13..c0458ce4398fd1fe99219afc019e4c9b4ad7eb59 100644 (file)
--- a/src/cocoa/cursor.mm
+++ b/src/cocoa/cursor.mm
@@ -393,9 +393,25 @@ static inline int GetPrivateCursorIdForStockCursor(int stock_cursor_id)
     return -1;
 }
 
     return -1;
 }
 

+// Keep an array of stock cursors so they can share wxCursorRefData and thus
+// wxObject::IsSameAs will return true.
+// They will obviously be destroyed at static destruction time which should
+// theoretically be fine.
+static wxCursor s_stockCursors[wxCURSOR_MAX];
+

 // Cursors by stock number (enum wxStockCursor)
 wxCursor::wxCursor(int stock_cursor_id)
 {
 // Cursors by stock number (enum wxStockCursor)
 wxCursor::wxCursor(int stock_cursor_id)
 {

+    // We default-constructed wxObject so our m_refData == NULL
+    if(stock_cursor_id >= 0 && stock_cursor_id < wxCURSOR_MAX)
+    {
+        // Attempt to reference an existing stock cursor
+        Ref(s_stockCursors[stock_cursor_id]);
+    }
+    // If we succeeded in getting an existing stock cursor, we're done.
+    if(m_refData != NULL)
+        return;
+

     m_refData = new wxCursorRefData;
 
     M_CURSORDATA->m_hCursor = nil;
     m_refData = new wxCursorRefData;
 
     M_CURSORDATA->m_hCursor = nil;


@@ -431,6 +447,13 @@ wxCursor::wxCursor(int stock_cursor_id)
 
     // This should never happen as the arrowCursor should always exist.
     wxASSERT(M_CURSORDATA->m_hCursor != nil);
 
     // This should never happen as the arrowCursor should always exist.
     wxASSERT(M_CURSORDATA->m_hCursor != nil);

+
+    // Store ourself as the new stock cursor for this ID so that future
+    // calls will share the same ref data.
+    if(stock_cursor_id >= 0 && stock_cursor_id < wxCURSOR_MAX)
+    {
+        s_stockCursors[stock_cursor_id] = *this;
+    }

 }
 
 wxCursor::~wxCursor()
 }
 
 wxCursor::~wxCursor()