Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h
index fe0c01391c16d89ad548e27895a6a9c768b9fb45..0dcf5be22db8979b2c3eb9de912b9b2153efe060 100644 (file)
--- a/include/wx/osx/cursor.h
+++ b/include/wx/osx/cursor.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/cursor.h
+// Name:        wx/osx/cursor.h
 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,7 +20,6 @@ public:
     wxCursor();
 
     wxCursor(const wxImage & image) ;
-    wxCursor(const char* const* bits);
     wxCursor(const wxString& name,
              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);
@@ -32,19 +30,18 @@ public:
 #endif
     virtual ~wxCursor();
 
-    bool CreateFromXpm(const char* const* bits);
-
     void MacInstall() const ;
 
     void SetHCURSOR(WXHCURSOR cursor);
     WXHCURSOR GetHCURSOR() const;
 
-private:
-    void InitFromStock(wxStockCursor);
-
+protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
+private:
+    void InitFromStock(wxStockCursor);
+
     void CreateFromImage(const wxImage & image) ;
 
     DECLARE_DYNAMIC_CLASS(wxCursor)