Minor corrections to make dist after reports

[wxWidgets.git] / include / wx / motif / cursor.h

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 11366cc4dfadfae6779084018e68229974623df2..9372b60e2b049bdc973849c0859cf311638b685d 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -12,16 +12,14 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#include "wx/object.h"
+#include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-class WXDLLEXPORT wxImage;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxObject
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-
 public:
     wxCursor();
 
@@ -39,17 +37,14 @@ public:
     wxCursor(wxStockCursor id);
     virtual ~wxCursor();
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const;
-
-    bool operator == (const wxCursor& cursor) const
-        { return m_refData == cursor.m_refData; }
-    bool operator != (const wxCursor& cursor) const
-        { return m_refData != cursor.m_refData; }
-
     // Motif-specific.
     // Create/get a cursor for the current display
     WXCursor GetXCursor(WXDisplay* display) const;
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,
@@ -58,9 +53,11 @@ private:
 
     // Make a cursor from standard id
     WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
+
+    DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
 
 #endif
 // _WX_CURSOR_H_