make OSX defines to be 1, not only defined, for backwards compatibility reasons

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

diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index 1b27f36a0549be7309933cacda14934795af69ef..76b695a411b3c8071c5a22cbe541c65060d62886 100644 (file)
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -12,42 +12,45 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#include "wx/bitmap.h"
+#include "wx/gdiobj.h"
+#include "wx/gdicmn.h"
+#include "wx/colour.h"

 
 

-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif
+class WXDLLIMPEXP_FWD_CORE wxImage;

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

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

 {
 public:
 {
 public:

-

     wxCursor();
     wxCursor();

-    wxCursor( int cursorId );
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif

 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif
 #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[]=0, wxColour *fg=0, wxColour *bg=0 );
+
+    wxCursor(const wxString& name,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+             int hotSpotX = 0, int hotSpotY = 0);

     virtual ~wxCursor();
     virtual ~wxCursor();

-    bool operator == ( const wxCursor& cursor ) const;
-    bool operator != ( const wxCursor& cursor ) const;
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;

 
     // implementation
 
     WXCursor GetCursor() const;
 
 
     // implementation
 
     WXCursor GetCursor() const;
 

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

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

-
-#endif
-    // _WX_CURSOR_H_
+#endif // _WX_CURSOR_H_