Use type safe list for model notifiers, sample corrected

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a29a6d608f9ab4df698c0e22d1c1f59d4f104ed3..6d32080afdce56ea35d041cf2f17f7ebf77d2b41 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -20,12 +20,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-#endif
-
-#include "wx/utils.h"
-#include "wx/window.h"
-
-#if wxUSE_IMAGE
+    #include "wx/utils.h"
+    #include "wx/window.h"
     #include "wx/image.h"
 #endif
 
@@ -55,10 +51,10 @@ 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
@@ -263,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)
@@ -297,7 +293,7 @@ wxCursor::~wxCursor()
 {
 }
 
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
 {
     return m_refData != NULL;
 }