deprecate wxStringEq

[wxWidgets.git] / include / wx / osx / carbon / cursor.h

diff --git a/include/wx/osx/carbon/cursor.h b/include/wx/osx/carbon/cursor.h
index 9a7b05715a2c7c954e3745e1c336b396b096df66..fe0c01391c16d89ad548e27895a6a9c768b9fb45 100644 (file)
--- a/include/wx/osx/carbon/cursor.h
+++ b/include/wx/osx/carbon/cursor.h
@@ -20,17 +20,16 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 public:
     wxCursor();
 
 public:
     wxCursor();
 

-    wxCursor(const char bits[], int width, int height,
-             int hotSpotX = -1, int hotSpotY = -1,
-             const char maskBits[] = NULL);
-

     wxCursor(const wxImage & image) ;
     wxCursor(const char* const* bits);
     wxCursor(const wxString& name,
     wxCursor(const wxImage & image) ;
     wxCursor(const char* const* bits);
     wxCursor(const wxString& name,

-             wxBitmapType flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,

              int hotSpotX = 0, int hotSpotY = 0);
 
              int hotSpotX = 0, int hotSpotY = 0);
 

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

     virtual ~wxCursor();
 
     bool CreateFromXpm(const char* const* bits);
     virtual ~wxCursor();
 
     bool CreateFromXpm(const char* const* bits);


@@ -41,6 +40,8 @@ public:
     WXHCURSOR GetHCURSOR() const;
 
 private:
     WXHCURSOR GetHCURSOR() const;
 
 private:

+    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;