Fixed wxDatePickerCtrl under OS X

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index ef1a25272676ab0d6622a5a85eff42ff48e6448e..8269c070484990036f6a79db795ed52fecf92115 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -10,19 +10,18 @@
 #ifndef _WX_GTK_CURSOR_H_
 #define _WX_GTK_CURSOR_H_
 
 #ifndef _WX_GTK_CURSOR_H_
 #define _WX_GTK_CURSOR_H_
 

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

 
 

-class WXDLLIMPEXP_CORE wxColour;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxImage;

 
 //-----------------------------------------------------------------------------
 // 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


@@ -30,16 +29,18 @@ 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[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
+              const char maskBits[] = NULL,
+              const wxColour *fg = NULL, const wxColour *bg = NULL );

     virtual ~wxCursor();
     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)
 };