X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550343399aa1355469ffed72c8cf84c732dcf98b..d48687a0719620cc888072db31bb3814dea400ab:/src/motif/cursor.cpp?ds=sidebyside

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a3af9a13da..6d32080afd 100644
--- 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"
 
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+#endif
+
 #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__
@@ -43,14 +47,14 @@ public:
 
 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;
+    friend class wxCursor;
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWidgets standard cursor id
@@ -255,7 +259,7 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
     int screen_num =  DefaultScreen (dpy);
 
     int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
-                                 wxConstCast(name.c_str(), char),
+                                 name.mb_str(),
                                  &w, &h, &pixmap, &hotX, &hotY);
 
     if (value == BitmapSuccess)
@@ -289,7 +293,7 @@ wxCursor::~wxCursor()
 {
 }
 
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
 {
     return m_refData != NULL;
 }
@@ -426,7 +430,7 @@ static int wxBusyCursorCount = 0;
 
 // Helper function
 static void
-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)
 {
     Display *display = (Display*) win->GetXDisplay();
 
@@ -462,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 }
 
 // Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
 {
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)