use AllocExclusive

[wxWidgets.git] / include / wx / mac / classic / cursor.h

diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h
index a18b2b9a96c574e064ff1847582680c7b6f2e258..c4c054676977aef9aac5b03f545c3808997608a4 100644 (file)
--- a/include/wx/mac/classic/cursor.h
+++ b/include/wx/mac/classic/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.h
+// Name:        wx/mac/classic/cursor.h

 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:


@@ -17,12 +17,12 @@
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)

-        
+

     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();

-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();

 
 protected:
     WXHCURSOR     m_hCursor;
 
 protected:
     WXHCURSOR     m_hCursor;


@@ -53,10 +53,11 @@ public:
         int hotSpotX = 0, int hotSpotY = 0);
 
   wxCursor(int cursor_type);
         int hotSpotX = 0, int hotSpotY = 0);
 
   wxCursor(int cursor_type);

-  ~wxCursor();
+  virtual ~wxCursor();

 
 

-       bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
+  bool CreateFromXpm(const char **bits) ;
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }

 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }