Applied colspan corrections, #15274 and #15275 (dghart)

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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 70a3e24583d896b37d66be2bb4508f64c15b4bdb..b3e56ef837faa34edf977a4c29c987c257e0ca84 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.cpp
+// Name:        src/gtk1/cursor.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,8 +11,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/cursor.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif // WX_PRECOMP
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
@@ -28,19 +31,23 @@ extern bool g_isIdle;
 // wxCursor
 //-----------------------------------------------------------------------------
 
-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData : public wxGDIRefData
 {
-  public:
-
+public:
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
     GdkCursor *m_cursor;
+
+private:
+    // There is no way to copy m_cursor so we can't implement a copy ctor
+    // properly.
+    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
 };
 
 wxCursorRefData::wxCursorRefData()
 {
-    m_cursor = (GdkCursor *) NULL;
+    m_cursor = NULL;
 }
 
 wxCursorRefData::~wxCursorRefData()
@@ -59,7 +66,7 @@ wxCursor::wxCursor()
 
 }
 
-wxCursor::wxCursor( int cursorId )
+void wxCursor::InitFromStock( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();
 
@@ -313,24 +320,22 @@ wxCursor::~wxCursor()
 {
 }
 
-bool wxCursor::operator == ( const wxCursor& cursor ) const
+GdkCursor *wxCursor::GetCursor() const
 {
-    return m_refData == cursor.m_refData;
+    return M_CURSORDATA->m_cursor;
 }
 
-bool wxCursor::operator != ( const wxCursor& cursor ) const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
-    return m_refData != cursor.m_refData;
+    return new wxCursorRefData;
 }
 
-bool wxCursor::Ok() const
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
 {
-    return (m_refData != NULL);
-}
+    wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxGTK.") );
 
-GdkCursor *wxCursor::GetCursor() const
-{
-    return M_CURSORDATA->m_cursor;
+    return new wxCursorRefData;
 }
 
 //-----------------------------------------------------------------------------
@@ -369,7 +374,7 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
     if (gs_busyCount++ > 0)
         return;
 
-    wxASSERT_MSG( !gs_savedCursor.Ok(),
+    wxASSERT_MSG( !gs_savedCursor.IsOk(),
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;