wxMGL compilation fixes

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

diff --git a/include/wx/mac/cursor.h b/include/wx/mac/cursor.h
index 250005009140ec4773cdf5c4c71e71f18e9edc57..c8414a4ee00c277125f5c6ad955515d79187fd73 100644 (file)
--- a/include/wx/mac/cursor.h
+++ b/include/wx/mac/cursor.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cursor.h
 // Purpose:     wxCursor class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "cursor.h"
 #endif
 
@@ -20,6 +20,8 @@
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {
+    DECLARE_NO_COPY_CLASS(wxCursorRefData)
+        
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxCursor;
 public:
@@ -27,7 +29,11 @@ public:
     ~wxCursorRefData();
 
 protected:
-  WXHCURSOR m_hCursor;
+    WXHCURSOR     m_hCursor;
+    bool        m_disposeHandle;
+    bool        m_releaseHandle;
+    bool        m_isColorCursor ;
+    long        m_themeCursor ;
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
@@ -42,27 +48,35 @@ public:
   wxCursor();
 
   // Copy constructors
-  inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
+  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 wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
-   int hotSpotX = 0, int hotSpotY = 0);
+    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);
   ~wxCursor();
 
-  virtual bool Ok() const { return (m_refData != NULL && M_CURSORDATA->m_hCursor != NULL ) ; }
+       bool CreateFromXpm(const char **bits) ;
+  virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
 
   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; }
 
-       void MacInstall() const ;
+    void MacInstall() const ;
 
   void SetHCURSOR(WXHCURSOR cursor);
   inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
+private :
+    void CreateFromImage(const wxImage & image) ;
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);