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 a40c79befa355fa5feb571e144da1878da8c04d9..6d32080afdce56ea35d041cf2f17f7ebf77d2b41 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -51,7 +51,7 @@ WX_DEFINE_LIST(wxXCursorList)
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {

-    friend class WXDLLEXPORT wxCursor;
+    friend class wxCursor;

 public:
     wxCursorRefData();
     virtual ~wxCursorRefData();
 public:
     wxCursorRefData();
     virtual ~wxCursorRefData();


@@ -259,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),
     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)
                                  &w, &h, &pixmap, &hotX, &hotY);
 
     if (value == BitmapSuccess)


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

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

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