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 01849e808589d3cbfc53f7a627ebce5095b1b5c3..76b695a411b3c8071c5a22cbe541c65060d62886 100644 (file)
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -13,6 +13,7 @@
 #define _WX_CURSOR_H_
 
 #include "wx/gdiobj.h"
 #define _WX_CURSOR_H_
 
 #include "wx/gdiobj.h"

+#include "wx/gdicmn.h"

 #include "wx/colour.h"
 
 class WXDLLIMPEXP_FWD_CORE wxImage;
 #include "wx/colour.h"
 
 class WXDLLIMPEXP_FWD_CORE wxImage;


@@ -25,14 +26,17 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
 {
 public:
     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();
 
     // implementation
     virtual ~wxCursor();
 
     // implementation


@@ -40,6 +44,8 @@ public:
     WXCursor GetCursor() const;
 
 protected:
     WXCursor GetCursor() const;
 
 protected:

+    void InitFromStock(wxStockCursor);
+

     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;