move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 71e36b2a53f76c0582623fcaaddaa36a214b009e..2612a6c8d2f46e42d4c61f0abb39ea253f90f4ad 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -10,8 +10,7 @@
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 

-#include "wx/defs.h"
-#include "wx/object.h"
+#include "wx/gdiobj.h"

 #include "wx/gdicmn.h"
 
 #if wxUSE_IMAGE
 #include "wx/gdicmn.h"
 
 #if wxUSE_IMAGE


@@ -22,10 +21,9 @@
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-

     wxCursor();
     wxCursor( int cursorId );
 #if wxUSE_IMAGE
     wxCursor();
     wxCursor( int cursorId );
 #if wxUSE_IMAGE


@@ -35,14 +33,15 @@ public:
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
     virtual ~wxCursor();
               int hotSpotX=-1, int hotSpotY=-1,
               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 Ok() const;

 
     // implementation
 
     GdkCursor *GetCursor() const;
 
 
     // implementation
 
     GdkCursor *GetCursor() const;
 

+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };