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 a6fcb40b17c89de74972646e9f271a2ac7e05c7d..44d03dd747ea871a98db15674376a836751357a6 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -2,60 +2,45 @@
 // Name:        cursor.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_CURSOR_H_
+#define _WX_GTK_CURSOR_H_
 
-#ifndef __GTKCURSORH__
-#define __GTKCURSORH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
 #include "wx/object.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
 
-class wxWindow;
-
-class wxCursor;
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxImage;
 
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 
-class wxCursor: public wxObject
+class WXDLLIMPEXP_CORE wxCursor: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
-  public:
-
-    wxCursor(void);
-    wxCursor( const int cursorId );
-    wxCursor( const wxCursor &cursor );
-    wxCursor( const wxCursor *cursor );
-    ~wxCursor(void);
-    wxCursor& operator = ( const wxCursor& cursor );
-    bool operator == ( const wxCursor& cursor );
-    bool operator != ( const wxCursor& cursor );
-    bool Ok(void) const;
-    
-  private:
-  public:
-  
-    friend wxWindow;
-  
-    GdkCursor *GetCursor(void) const;
-
-    // no data :-)
+public:
+
+    wxCursor();
+    wxCursor( int cursorId );
+#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[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
+    virtual ~wxCursor();
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+
+    // implementation
+
+    GdkCursor *GetCursor() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
-#endif // __GTKCURSORH__
+#endif // _WX_GTK_CURSOR_H_