allow having children of status bar in XRC (patch 1704125)

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

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 48e37f2b5981e74e961057908e8450ca99aa3858..5b9c7899d1e3b201ee01259d6308d174fc06b55c 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -21,10 +21,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/hashmap.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/hashmap.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
-

 #include "wx/mgl/private.h"
 
 
 #include "wx/mgl/private.h"
 
 


@@ -37,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData
   public:
 
     wxCursorRefData();
   public:
 
     wxCursorRefData();

-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();

 
     MGLCursor *m_cursor;
 };
 
     MGLCursor *m_cursor;
 };


@@ -176,17 +175,7 @@ wxCursor::~wxCursor()
     // wxObject unrefs data
 }
 
     // 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
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }