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 11c30421c7d75f157938b61edf9cc651c0ad5d5b..6d32080afdce56ea35d041cf2f17f7ebf77d2b41 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -22,9 +22,6 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"

-#endif
-
-#if wxUSE_IMAGE

     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 


@@ -54,10 +51,10 @@ WX_DEFINE_LIST(wxXCursorList)
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {

-    friend class WXDLLEXPORT wxCursor;
+    friend class wxCursor;

 public:
     wxCursorRefData();
 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


@@ -262,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)


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

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

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