avoiding nesting dcs on the same window concurrently

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

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index d2334ba0d2aa3d4681881661336cf8dec7fbe8f6..709b59e34f341f94e25fcfd6366814c77656e59e 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -15,11 +15,14 @@
 #endif
 
 #include "wx/cursor.h"
-#include "wx/module.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/hashmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/hashmap.h"
+    #include "wx/module.h"
+#endif
 
 #include "wx/mgl/private.h"
 
@@ -33,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData
   public:
 
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
     MGLCursor *m_cursor;
 };
@@ -167,24 +170,11 @@ wxCursor::wxCursor(const wxString& cursor_file,
     }
 }
 
-wxCursor::wxCursor(const wxCursor &cursor)
-{
-    Ref(cursor);
-}
-
 wxCursor::~wxCursor()
 {
     // wxObject unrefs data
 }
 
-wxCursor& wxCursor::operator = (const wxCursor& cursor)
-{
-    if ( *this == cursor )
-        return (*this);
-    Ref(cursor);
-    return *this;
-}
-
 bool wxCursor::operator == (const wxCursor& cursor) const
 {
     return (m_refData == cursor.m_refData);
@@ -195,7 +185,7 @@ bool wxCursor::operator != (const wxCursor& cursor) const
     return (m_refData != cursor.m_refData);
 }
 
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
 {
     return (m_refData != NULL);
 }
@@ -256,7 +246,7 @@ void wxEndBusyCursor()
     gs_savedCursor = wxNullCursor;
 }
 
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
 {
     if ( gs_busyCount++ > 0 ) return;