X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..32f8e36335fbd7116593bf57917a9be294cae363:/include/wx/os2/cursor.h diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h index bc6397069f..688539c46d 100644 --- a/include/wx/os2/cursor.h +++ b/include/wx/os2/cursor.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// // Name: 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 @@ -27,9 +23,7 @@ public: ~wxCursorRefData(); protected: -/* TODO: implementation - WXHCURSOR m_hCursor; -*/ + bool m_destroyCursor; }; #define M_CURSORDATA ((wxCursorRefData *)m_refData) @@ -45,31 +39,26 @@ public: // Copy constructors inline wxCursor(const wxCursor& cursor) { Ref(cursor); } + wxCursor(const wxImage& rImage); 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) ; } 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; } -/* TODO: implementation void SetHCURSOR(WXHCURSOR cursor); inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); } -*/ -}; -extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); + bool FreeResource(bool force = FALSE); +}; #endif // _WX_CURSOR_H_