Clear is also expected to clear the text

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index df2e6c14b9abaa8cb278e09209aab0fbf11187ac..56b1b840ca59f6f85436ed0b8fe5fc883cddc5ae 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -23,6 +23,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/image.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/image.h"

+    #include "wx/log.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__


@@ -58,6 +59,11 @@ public:
     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
 

+private:
+    // There is no way to copy m_cursor so we can't implement a copy ctor
+    // properly.
+    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
+

     friend class wxCursor;
 };
 
     friend class wxCursor;
 };
 


@@ -245,8 +251,8 @@ wxCursor::wxCursor(const char bits[], int width, int height,
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 

-wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
-                  int hotSpotY )
+wxCursor::wxCursor(const wxString& name, wxBitmapType type,
+                   int hotSpotX, int hotSpotY)

 {
     // Must be an XBM file
     if (type != wxBITMAP_TYPE_XBM) {
 {
     // Must be an XBM file
     if (type != wxBITMAP_TYPE_XBM) {


@@ -303,9 +309,12 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
     return new wxCursorRefData;
 }
 
     return new wxCursorRefData;
 }
 

-wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const

 {
 {

-    return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
+    wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxMotif.") );
+
+    return new wxCursorRefData;

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


@@ -457,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)
     else
     {
         // Restore old cursor
     else
     {
         // Restore old cursor

-        if (win->GetCursor().Ok())
+        if (win->GetCursor().IsOk())

             attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
         else
             attrs.cursor = None;
             attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
         else
             attrs.cursor = None;