Don't duplicate event sending code in wxGTK wxListBox.

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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 6e9d9f33a881c182f882111ffb55cd631efeb9a5..b402989ce0c8f9ee8290e25f34f3fb6657d777e0 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -14,10 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/utils.h"
 #endif // WX_PRECOMP
 
-#include "wx/utils.h"
-
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
@@ -32,19 +31,18 @@ extern bool g_isIdle;
 // wxCursor
 //-----------------------------------------------------------------------------
 
-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData : public wxGDIRefData
 {
-  public:
-
+public:
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
     GdkCursor *m_cursor;
 };
 
 wxCursorRefData::wxCursorRefData()
 {
-    m_cursor = (GdkCursor *) NULL;
+    m_cursor = NULL;
 }
 
 wxCursorRefData::~wxCursorRefData()
@@ -63,7 +61,7 @@ wxCursor::wxCursor()
 
 }
 
-wxCursor::wxCursor( int cursorId )
+void wxCursor::InitFromStock( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();
 
@@ -317,24 +315,19 @@ wxCursor::~wxCursor()
 {
 }
 
-bool wxCursor::operator == ( const wxCursor& cursor ) const
-{
-    return m_refData == cursor.m_refData;
-}
-
-bool wxCursor::operator != ( const wxCursor& cursor ) const
+GdkCursor *wxCursor::GetCursor() const
 {
-    return m_refData != cursor.m_refData;
+    return M_CURSORDATA->m_cursor;
 }
 
-bool wxCursor::Ok() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
-    return (m_refData != NULL);
+    return new wxCursorRefData;
 }
 
-GdkCursor *wxCursor::GetCursor() const
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    return M_CURSORDATA->m_cursor;
+    return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
 }
 
 //-----------------------------------------------------------------------------