don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

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

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index e1dc95769ef15d20aa58a52a8e75eb70c7ccc5a9..0f465ccb5573a1295f9913b1a1df7231d9748d05 100644 (file)
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -18,7 +18,7 @@ class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData
 {
 public:
     wxCursorRefData();
 {
 public:
     wxCursorRefData();

-    ~wxCursorRefData() { Free(); }
+    virtual ~wxCursorRefData() { Free(); }

     virtual void Free(void);
     bool                            m_bDestroyCursor;
 }; // end of CLASS wxCursorRefData
     virtual void Free(void);
     bool                            m_bDestroyCursor;
 }; // end of CLASS wxCursorRefData


@@ -32,8 +32,6 @@ class WXDLLEXPORT wxCursor: public wxBitmap
 public:
     wxCursor();
 
 public:
     wxCursor();
 

-    // Copy constructors
-    wxCursor(const wxCursor& rCursor) { Ref(rCursor); }

     wxCursor(const wxImage& rImage);
 
     wxCursor( const char acBits[]
     wxCursor(const wxImage& rImage);
 
     wxCursor( const char acBits[]


@@ -51,16 +49,6 @@ public:
     wxCursor(int nCursorType);
     inline ~wxCursor() { }
 
     wxCursor(int nCursorType);
     inline ~wxCursor() { }
 

-    inline wxCursor& operator = (const wxCursor& rCursor)
-    {
-        if (*this == rCursor)
-            return (*this);
-        Ref(rCursor);
-        return *this;
-    }
-    inline bool operator == (const wxCursor& rCursor) { return m_refData == rCursor.m_refData; }
-    inline bool operator != (const wxCursor& rCursor) { 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); }
 
     inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
     inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }