X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/os2/cursor.h

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index bc6397069f..5bda492eb1 100644
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -1,75 +1,60 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/os2/cursor.h
 // Purpose:     wxCursor class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/13/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#ifdef __GNUG__
-#pragma interface "cursor.h"
-#endif
-
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
+class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData
 {
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
-
-protected:
-/* TODO: implementation
-  WXHCURSOR m_hCursor;
-*/
-};
+    virtual ~wxCursorRefData() { Free(); }
+    virtual void Free(void);
+    bool                            m_bDestroyCursor;
+}; // end of CLASS wxCursorRefData
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
 public:
-  wxCursor();
-
-  // Copy constructors
-  inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
-
-  wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
-    const char maskBits[] = NULL);
-
-  /* TODO: make default type suit platform */
-  wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
-   int hotSpotX = 0, int hotSpotY = 0);
-
-  wxCursor(int cursor_type);
-  ~wxCursor();
-
-  // TODO: also verify the internal cursor handle
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    wxCursor();
+
+    wxCursor(const wxImage& rImage);
+
+    wxCursor( const wxString& rsName
+             ,wxBitmapType    lType = wxCURSOR_DEFAULT_TYPE
+             ,int             nHotSpotX = 0
+             ,int             nHotSpotY = 0
+            );
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
+    inline ~wxCursor() { }
 
-  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-  inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
-  inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
+    inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
+    inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
 
-/* TODO: implementation
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
-*/
-};
+protected:
+    void InitFromStock(wxStockCursor);
+    inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
 
-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)
+}; // end of CLASS wxCursor
 
 #endif
     // _WX_CURSOR_H_