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

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "cursor.h"
 #endif
 
 #pragma interface "cursor.h"
 #endif
 


@@ -56,13 +56,15 @@ public:
     const char maskBits[] = NULL);
 
     wxCursor(const wxImage & image) ;
     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,
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,

-   int hotSpotX = 0, int hotSpotY = 0);
+        int hotSpotX = 0, int hotSpotY = 0);

 
   wxCursor(int cursor_type);
   ~wxCursor();
 
 
   wxCursor(int cursor_type);
   ~wxCursor();
 

+       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; }
   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; }