don't redeclare vsscanf() for Windows compilers, the case of missing declaration...

[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 7d1cff7bbe8c1534154d5f702e016382733a6499..a9248f7e90a40da24839a92d7c6f2b35647140b9 100644 (file)
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/mac/carbon/cursor.h
 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,74 +12,42 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cursor.h"
-#endif
-
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
-{
-    DECLARE_NO_COPY_CLASS(wxCursorRefData)
-        
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxCursorRefData();
-    ~wxCursorRefData();
-
-protected:
-    WXHCURSOR     m_hCursor;
-    bool        m_disposeHandle;
-    bool        m_releaseHandle;
-    bool        m_isColorCursor ;
-    long        m_themeCursor ;
-};
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
-
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
 public:
-  wxCursor();
-
-  // Copy constructors
-  wxCursor(const wxCursor& cursor)
-      : wxBitmap()
-  { Ref(cursor); }
+    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 char* const* bits);
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
-        int hotSpotX = 0, int hotSpotY = 0);
-
-  wxCursor(int cursor_type);
-  ~wxCursor();
+             int hotSpotX = 0, int hotSpotY = 0);
 
-       bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
+    wxCursor(int cursor_type);
+    virtual ~wxCursor();
 
-  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-  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* const* bits);
 
     void MacInstall() const ;
 
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
-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);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
 
-#endif
-    // _WX_CURSOR_H_
+#endif // _WX_CURSOR_H_