Update to Scintilla 1.53

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

diff --git a/include/wx/mac/cursor.h b/include/wx/mac/cursor.h
index 850275ba280e04226243eadb34a4c8068d3c95d2..7f1a8ea8b44fe95fcb5398d8e009994508bc7129 100644 (file)
--- a/include/wx/mac/cursor.h
+++ b/include/wx/mac/cursor.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_


@@ -29,11 +29,11 @@ public:
     ~wxCursorRefData();
 
 protected:
     ~wxCursorRefData();
 
 protected:

-    WXHCURSOR  m_hCursor;
-    bool               m_disposeHandle;
-    bool               m_releaseHandle;
+    WXHCURSOR     m_hCursor;
+    bool        m_disposeHandle;
+    bool        m_releaseHandle;

     bool        m_isColorCursor ;
     bool        m_isColorCursor ;

-    long               m_themeCursor ;
+    long        m_themeCursor ;

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -56,20 +56,22 @@ public:
     const char maskBits[] = NULL);
 
     wxCursor(const wxImage & image) ;
     const char maskBits[] = NULL);
 
     wxCursor(const wxImage & image) ;

-
-       wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
-   int hotSpotX = 0, int hotSpotY = 0);
+    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();
 
 
   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; }
   inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
 
   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); }
 
   void SetHCURSOR(WXHCURSOR cursor);
   inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }