fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h
index 2495246c57471ae3e62a9a5f66984d1ee8a1267e..9e1d4e0a557ffac111d9cddd9dd0b804118accf4 100644 (file)
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -15,41 +15,40 @@
 #include "wx/bitmap.h"
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLEXPORT wxCursor : public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
 public:
-  wxCursor();
+    wxCursor();
 
-  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);
 
     wxCursor(const wxImage & image) ;
     wxCursor(const char **bits) ;
     wxCursor(char **bits) ;
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
-        int hotSpotX = 0, int hotSpotY = 0);
-
-  wxCursor(int cursor_type);
-  virtual ~wxCursor();
+             int hotSpotX = 0, int hotSpotY = 0);
 
-  bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const { return IsOk(); }
-  virtual bool IsOk() const ;
+    wxCursor(int cursor_type);
+    virtual ~wxCursor();
 
-  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; }
+    bool CreateFromXpm(const char **bits) ;
 
     void MacInstall() const ;
 
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR() const ;
-private :
+    void SetHCURSOR(WXHCURSOR cursor);
+    WXHCURSOR GetHCURSOR() const;
+
+private:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
     void CreateFromImage(const wxImage & image) ;
+
+    DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
-#endif
-    // _WX_CURSOR_H_
+#endif // _WX_CURSOR_H_