added NZST and NZDT time zones (request 617912)

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index f1f7ca00d439ea55a33de6a2f73c1ab8a8f6d177..f4e0f4b71cd475c6da79ec447f4fbbc80eac9ace 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -7,21 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_CURSOR_H_
+#define _WX_GTK_CURSOR_H_

 
 

-#ifndef __GTKCURSORH__
-#define __GTKCURSORH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"

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

-#include "wx/gdicmn.h"

 
 

-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxImage;

 
 //-----------------------------------------------------------------------------
 // wxCursor
 
 //-----------------------------------------------------------------------------
 // wxCursor


@@ -33,18 +25,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
 


@@ -54,4 +45,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 

-#endif // __GTKCURSORH__
+#endif // _WX_GTK_CURSOR_H_