minor clean up

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

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index bc6397069fc9d4d0ee10bba44479520ccec6f9c4..e261d2cc07471b98cf23f68d37779fe32c84ef06 100644 (file)
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cursor.h
 // Purpose:     wxCursor class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cursor.h
 // Purpose:     wxCursor class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#ifdef __GNUG__
-#pragma interface "cursor.h"
-#endif
-

 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData


@@ -27,9 +23,7 @@ public:
     ~wxCursorRefData();
 
 protected:
     ~wxCursorRefData();
 
 protected:

-/* TODO: implementation
-  WXHCURSOR m_hCursor;
-*/
+  bool m_destroyCursor;

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -48,28 +42,22 @@ public:
 
   wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
     const char maskBits[] = NULL);
 
   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(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
    int hotSpotX = 0, int hotSpotY = 0);

-

   wxCursor(int cursor_type);
   ~wxCursor();
 
   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; }
 
   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); }
   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_
 
 #endif
     // _WX_CURSOR_H_