Interface fixes for Phoenix

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

diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index 6d5c213f8a070a4ba871b767877496ee50b3df63..19423ecffe63a694e29a710ba8057f78870d9825 100644 (file)
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -12,70 +12,34 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#ifdef __GNUG__
-    #pragma interface "cursor.h"
-#endif
-
-// compatible (even if incorrect) behaviour by default: derive wxCursor from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 0
-#endif
-
-#if wxICON_IS_BITMAP
-    #include "wx/bitmap.h"
-
-    #define wxCursorRefDataBase   wxBitmapRefData
-    #define wxCursorBase          wxBitmap
-#else
-    #include "wx/msw/gdiimage.h"
-
-    #define wxCursorRefDataBase   wxGDIImageRefData
-    #define wxCursorBase          wxGDIImage
-#endif
-
-class WXDLLEXPORT wxImage;
-
-class WXDLLEXPORT wxCursorRefData : public wxCursorRefDataBase
-{
-public:
-    wxCursorRefData();
-    virtual ~wxCursorRefData() { Free(); }
-
-    virtual void Free();
+#include "wx/msw/gdiimage.h"
 
-    // for compatibility
-public:
-    bool m_destroyCursor;
-};
+class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
-class WXDLLEXPORT wxCursor : public wxCursorBase
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage
 {
 public:
+    // constructors
     wxCursor();
-
-    // Copy constructors
-    wxCursor(const wxCursor& cursor) { Ref(cursor); }
-    wxCursor(const wxImage & image) ;
-    wxCursor(const char bits[], int width, int height,
-             int hotSpotX = -1, int hotSpotY = -1,
-             const char maskBits[] = NULL);
+    wxCursor(const wxImage& image);
     wxCursor(const wxString& name,
-             long flags = wxBITMAP_TYPE_CUR_RESOURCE,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);
-    wxCursor(int cursor_type);
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
     virtual ~wxCursor();
 
-    wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-    bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
-    bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
-
+    // implementation only
     void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); }
     WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }
 
 protected:
-    virtual wxGDIImageRefData *CreateData() const { return new wxCursorRefData; }
+    void InitFromStock(wxStockCursor);
+
+    virtual wxGDIImageRefData *CreateData() const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCursor)