Avoid id clashes

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

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index ecb60d73297e2442e2e2c3925a110a80c68d75cd..e3b3f09ca527e18db77e2cd83d685be15014cb35 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -1,76 +1,65 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.h
+// Name:        wx/cocoa/cursor.h

 // Purpose:     wxCursor class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2002/11/27
 // Purpose:     wxCursor class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2002/11/27

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

 // Copyright:   (c) David Elliott
 // Copyright:   (c) David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_CURSOR_H_
 #define _WX_COCOA_CURSOR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_CURSOR_H_
 #define _WX_COCOA_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 wxObjectRefData
+class WXDLLIMPEXP_CORE wxCursorRefData : public wxGDIRefData

 {
 {

-    DECLARE_NO_COPY_CLASS(wxCursorRefData)
-        
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;

 public:
     wxCursorRefData();
 public:
     wxCursorRefData();

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

 
 protected:
     int m_width, m_height;
     WX_NSCursor m_hCursor;
 
 protected:
     int m_width, m_height;
     WX_NSCursor m_hCursor;

+
+    friend class WXDLLIMPEXP_FWD_CORE wxBitmap;
+    friend class WXDLLIMPEXP_FWD_CORE wxCursor;
+
+    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor

-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor: public wxBitmap

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
-

 public:
 public:

-  wxCursor();
+    wxCursor();

 
 

-  // Copy constructors
-  wxCursor(const wxCursor& cursor)
-      : wxBitmap()
-  { Ref(cursor); }
+    wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+             int hotSpotX = 0, int hotSpotY = 0);

 
 

-  wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
-    const char maskBits[] = NULL);
-
-  wxCursor(const wxString& name, long flags = 0,
-   int hotSpotX = 0, int hotSpotY = 0);
-
-  wxCursor(int cursor_type);
-  ~wxCursor();
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
+    virtual ~wxCursor();

 
 

-  virtual bool Ok() const { return m_refData ; }
+    // FIXME: operator==() is wrong!
+    bool operator==(const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
+    bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); }

 
 

-  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; }
-  
-  inline WX_NSCursor GetNSCursor() const
-  {    
-    return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
-  }
+    WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; }

 
 

+private:
+    void InitFromStock(wxStockCursor);
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 };
 
 };
 

-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);

 
 

-#endif // _WX_COCOA_CURSOR_H_
+#endif
+    // _WX_COCOA_CURSOR_H_