still support wxNB_XXX and wxADJUST_MINSIZE in XRC files even if they're deprecated...

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

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index b2a4c69a7c5eb120fe06db2ebaa6c2a7d07ff4b0..b43d0b254b3c3c7a7ee199312d0c9f454559eb8d 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;
 };
@@ -172,21 +175,6 @@ wxCursor::~wxCursor()
     // wxObject unrefs data
 }
 
-bool wxCursor::operator == (const wxCursor& cursor) const
-{
-    return (m_refData == cursor.m_refData);
-}
-
-bool wxCursor::operator != (const wxCursor& cursor) const
-{
-    return (m_refData != cursor.m_refData);
-}
-
-bool wxCursor::Ok() const
-{
-    return (m_refData != NULL);
-}
-
 MGLCursor *wxCursor::GetMGLCursor() const
 {
     return M_CURSORDATA->m_cursor;
@@ -243,7 +231,7 @@ void wxEndBusyCursor()
     gs_savedCursor = wxNullCursor;
 }
 
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
 {
     if ( gs_busyCount++ > 0 ) return;