don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 6027e12790131c4919b6d8b37e2123706e835c5a..f1f7ca00d439ea55a33de6a2f73c1ab8a8f6d177 100644 (file)
--- 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(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -19,17 +19,24 @@
 #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 );