Don't call wxSafeYield() from wxGenericListCtrl::EditLabel().

[wxWidgets.git] / src / dfb / cursor.cpp

diff --git a/src/dfb/cursor.cpp b/src/dfb/cursor.cpp
index 0751f9ae4e131c07e0f558685095e538c9f79a00..e013a91295a1a78b01c149a02702426ff9ba9308 100644 (file)
--- a/src/dfb/cursor.cpp
+++ b/src/dfb/cursor.cpp
@@ -30,6 +30,15 @@ public:
 
     virtual bool IsOk() const { return m_bitmap.IsOk(); }
 
 
     virtual bool IsOk() const { return m_bitmap.IsOk(); }
 

+    // Create a deep copy of this object.
+    wxCursorRefData *Clone() const
+    {
+        wxBitmap bitmapCopy(m_bitmap);
+        bitmapCopy.UnShare();
+
+        return new wxCursorRefData(bitmapCopy, m_id);
+    }
+

     int      m_id;
     wxBitmap m_bitmap;
 };
     int      m_id;
     wxBitmap m_bitmap;
 };


@@ -43,23 +52,13 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject)
 

-wxCursor::wxCursor(int cursorId)
+void wxCursor::InitFromStock(wxStockCursor cursorId)

 {
 #warning "FIXME -- implement the cursor as bitmaps (that's what DFB uses)"
 }
 
 {
 #warning "FIXME -- implement the cursor as bitmaps (that's what DFB uses)"
 }
 

-wxCursor::wxCursor(const char WXUNUSED(bits)[],
-                   int WXUNUSED(width),
-                   int WXUNUSED(height),
-                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
-                   const char WXUNUSED(maskBits)[],
-                   wxColour * WXUNUSED(fg), wxColour * WXUNUSED(bg) )
-{
-#warning "FIXME"
-}
-

 wxCursor::wxCursor(const wxString& cursor_file,
 wxCursor::wxCursor(const wxString& cursor_file,

-                   long flags,
+                   wxBitmapType type,

                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))
 {
 #warning "FIXME"
                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))
 {
 #warning "FIXME"


@@ -72,7 +71,7 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
 
 wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxCursorRefData(*(wxCursorRefData *)data);
+    return static_cast<const wxCursorRefData *>(data)->Clone();

 }
 
 
 }