Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 5886b6e20f018d255dce45311483290d1a2530f6..3fd0cec98fe201a7ef7563aa5aa46e2ffefd168f 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"


@@ -27,21 +22,19 @@
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

-class wxCursor: public wxObject
+class WXDLLIMPEXP_CORE wxCursor: public wxObject

 {
 public:
 
     wxCursor();
     wxCursor( int cursorId );
 {
 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,
 #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 );
+              const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );

     ~wxCursor();
     ~wxCursor();

-    wxCursor& operator = ( const wxCursor& cursor );

     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;