remove Create{Window,Client,Paint}DC() methods without window parameter -- they don...

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index fdcb917d393ed4bd74ddcd4ef57baf2c48a3c2b4..134c7e9596587eb37b63917f20450f148649d3ee 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -21,11 +21,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

-#endif
-
-#include "wx/window.h"
-
-#if wxUSE_IMAGE
+    #include "wx/window.h"

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


@@ -53,15 +49,16 @@ WX_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxXCursorList)
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxXCursorList)
 

-class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
+class WXDLLEXPORT wxCursorRefData: public wxGDIRefData

 {
 {

-    friend class WXDLLEXPORT 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

+
+    friend class wxCursor;

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -263,7 +260,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)


@@ -297,9 +294,14 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::Ok() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
+{
+    return new wxCursorRefData;
+}
+
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    return m_refData != NULL;
+    return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data));

 }
 
 // Motif-specific: create/get a cursor for the current display
 }
 
 // Motif-specific: create/get a cursor for the current display