X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/os2/cursor.h?ds=sidebyside

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index eee0aeba20..f00ca92c39 100644
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -14,11 +14,11 @@
 
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData
+class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData
 {
 public:
     wxCursorRefData();
-    ~wxCursorRefData() { Free(); }
+    virtual ~wxCursorRefData() { Free(); }
     virtual void Free(void);
     bool                            m_bDestroyCursor;
 }; // end of CLASS wxCursorRefData
@@ -27,44 +27,29 @@ public:
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
 {
 public:
     wxCursor();
 
-    // Copy constructors
-    wxCursor(const wxCursor& rCursor) { Ref(rCursor); }
     wxCursor(const wxImage& rImage);
 
-    wxCursor( const char acBits[]
-             ,int        nWidth
-             ,int        nHeight
-             ,int        nHotSpotX = -1
-             ,int        nHotSpotY = -1
-             ,const char zMaskBits[] = NULL
-            );
     wxCursor( const wxString& rsName
-             ,long            lFlags = wxBITMAP_TYPE_CUR_RESOURCE
+             ,wxBitmapType    lType = wxCURSOR_DEFAULT_TYPE
              ,int             nHotSpotX = 0
              ,int             nHotSpotY = 0
             );
-    wxCursor(int nCursorType);
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
     inline ~wxCursor() { }
 
-    inline wxCursor& operator = (const wxCursor& rCursor)
-    {
-        if (*this == rCursor)
-            return (*this);
-        Ref(rCursor);
-        return *this;
-    }
-    inline bool operator == (const wxCursor& rCursor) const { return m_refData == rCursor.m_refData; }
-    inline bool operator != (const wxCursor& rCursor) const { return m_refData != rCursor.m_refData; }
-
     inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
     inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
 
 protected:
+    void InitFromStock(wxStockCursor);
     inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
 
 private: