add wxCmdLineParser::AddUsageText() and wxCMD_LINE_USAGE_TEXT (modified patch 1957542)

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

diff --git a/src/dfb/cursor.cpp b/src/dfb/cursor.cpp
index 58417b3d3b9ae9266011c130ff4ba703a10c5f7c..0751f9ae4e131c07e0f558685095e538c9f79a00 100644 (file)
--- a/src/dfb/cursor.cpp
+++ b/src/dfb/cursor.cpp
@@ -22,12 +22,14 @@
 // wxCursorRefData
 //-----------------------------------------------------------------------------
 
 // wxCursorRefData
 //-----------------------------------------------------------------------------
 

-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData : public wxGDIRefData

 {
 public:
     wxCursorRefData(const wxBitmap& bmp = wxNullBitmap, int id = -1)
         : m_id(id), m_bitmap(bmp) {}
 
 {
 public:
     wxCursorRefData(const wxBitmap& bmp = wxNullBitmap, int id = -1)
         : m_id(id), m_bitmap(bmp) {}
 

+    virtual bool IsOk() const { return m_bitmap.IsOk(); }
+

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


@@ -63,36 +65,12 @@ wxCursor::wxCursor(const wxString& cursor_file,
 #warning "FIXME"
 }
 
 #warning "FIXME"
 }
 

-bool wxCursor::Ok() const
-{
-    return m_refData && M_CURSOR->m_bitmap.Ok();
-}
-
-bool wxCursor::operator==(const wxCursor& cursor) const
-{
-    if ( Ok() )
-    {
-        if ( !cursor.Ok() )
-            return false;
-        else if ( M_CURSOR->m_id != M_CURSOR_OF(cursor)->m_id )
-            return false;
-        else if ( M_CURSOR->m_id == -1 ) // non-stock cursor
-            return (m_refData == cursor.m_refData);
-        else
-            return true; // IDs != -1 and are the same
-    }
-    else
-    {
-        return !cursor.Ok();
-    }
-}
-
-wxObjectRefData *wxCursor::CreateRefData() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const

 {
     return new wxCursorRefData;
 }
 
 {
     return new wxCursorRefData;
 }
 

-wxObjectRefData *wxCursor::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxCursorRefData(*(wxCursorRefData *)data);
 }
 {
     return new wxCursorRefData(*(wxCursorRefData *)data);
 }