Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index fc353d46830f8d280b8af18c7e1d890d3285ba93..a9964a07f8ecaab17fb64a54e90ebfae8343bd52 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -7,29 +7,34 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 
-class wxCursor: public wxObject
+class WXDLLIMPEXP_CORE wxCursor: public wxObject
 {
 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;