Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index b760e0b512225b0369ded079c954a25cc1b75881..8269c070484990036f6a79db795ed52fecf92115 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -2,60 +2,47 @@
 // Name:        cursor.h
 // Purpose:
 // Author:      Robert Roebling
 // 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__
+#include "wx/gdiobj.h"

 
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxWindow;
-
-class wxCursor;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxImage;

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
+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();

 
 

-  public:
+    // implementation

 
 

-    wxCursor(void);
-    wxCursor( 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 :-)
+    GdkCursor *GetCursor() const;
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 };
 
 };
 

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