use (new) wxAcceleratorEntry::Create() instead of recently deprecated wxGetAccelFromS...

[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..cf62dbf40a36ffd913813e33399a7dfdb0b0eb88 100644 (file)
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -12,33 +12,8 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cursor.h"
-#endif
-

 #include "wx/bitmap.h"
 
 #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
 {
 // Cursor
 class WXDLLEXPORT wxCursor: public wxBitmap
 {


@@ -47,11 +22,6 @@ class WXDLLEXPORT wxCursor: public wxBitmap
 public:
   wxCursor();
 
 public:
   wxCursor();
 

-  // Copy constructors
-  wxCursor(const wxCursor& cursor)
-      : wxBitmap()
-  { Ref(cursor); }
-

   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);
 


@@ -65,16 +35,15 @@ public:
   ~wxCursor();
 
        bool CreateFromXpm(const char **bits) ;
   ~wxCursor();
 
        bool CreateFromXpm(const char **bits) ;

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

 
 

-  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; }
 
     void MacInstall() const ;
 
   void SetHCURSOR(WXHCURSOR cursor);
   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; }
 
     void MacInstall() const ;
 
   void SetHCURSOR(WXHCURSOR cursor);

-  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
+  inline WXHCURSOR GetHCURSOR() const ;

 private :
     void CreateFromImage(const wxImage & image) ;
 };
 private :
     void CreateFromImage(const wxImage & image) ;
 };