X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bbe427f8e5a2078b266e282453595b5a634d35c..5706de1cf469f1ca53be7c402365d47e12a616cf:/include/wx/gtk1/cursor.h?ds=sidebyside

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index d274b6be95..655103113a 100644
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -11,7 +11,7 @@
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -19,28 +19,39 @@
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 
 class wxCursor: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
-  public:
+public:
 
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );
+#if wxUSE_IMAGE
+    wxCursor( const wxImage & image );
+#endif
+    wxCursor( const char bits[], int width, int  height,
+              int hotSpotX=-1, int hotSpotY=-1,
+              const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );
     ~wxCursor();
     wxCursor& operator = ( const wxCursor& cursor );
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 
+    // implementation
+
     GdkCursor *GetCursor() const;
 
-    // no data :-)
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
 #endif // __GTKCURSORH__