Fix for always failing assert in GetValue. Save the same value that

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a3af9a13dab5aa87e8de344081630c97adeade7f..6bfc0ab44161f401e66daeb5b44b10fb6ebadaed 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -12,13 +12,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+#endif
+

 #include "wx/cursor.h"
 #include "wx/cursor.h"

-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "wx/window.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/image.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__


@@ -43,14 +47,14 @@ public:
 
 WX_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxXCursorList);
+WX_DEFINE_LIST(wxXCursorList)

 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();

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

 
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWidgets standard cursor id
 
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWidgets standard cursor id


@@ -289,7 +293,7 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

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


@@ -426,7 +430,7 @@ static int wxBusyCursorCount = 0;
 
 // Helper function
 static void
 
 // Helper function
 static void

-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)

 {
     Display *display = (Display*) win->GetXDisplay();
 
 {
     Display *display = (Display*) win->GetXDisplay();
 


@@ -462,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 }
 
 // Set the cursor to the busy cursor for all windows
 }
 
 // Set the cursor to the busy cursor for all windows

-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)

 {
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)
 {
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)