Change GetC to return an int so that it can return wxEOF on error.

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

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 67eabdb5de910f48d805a098f73dda5023318fcd..30969ed9efde8138355f4faef4eee1c3c66fc8f9 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -28,18 +28,17 @@ public:
 
     wxCursor();
     wxCursor( int cursorId );
 
     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 );
-    ~wxCursor();
-    wxCursor& operator = ( const wxCursor& cursor );
+              const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
+    virtual ~wxCursor();

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

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
 
 
     // implementation