remove warnings of intentionally unreachable code

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 1fe4410d33e1a3690ae5c3d7df2e6799b3898d5b..44d03dd747ea871a98db15674376a836751357a6 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -7,16 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKCURSORH__
-#define __GTKCURSORH__
+#ifndef _WX_GTK_CURSOR_H_
+#define _WX_GTK_CURSOR_H_

 
 

-#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,11 +30,10 @@ public:
 #endif
     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
 #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();
-    bool operator == ( const wxCursor& cursor ) const;
-    bool operator != ( const wxCursor& cursor ) const;
-    bool Ok() const;
+              const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
+    virtual ~wxCursor();
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
 
 
     // implementation
 


@@ -47,4 +43,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 

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