fixed wxMac compilation after ShowWithEffect() changes; also fixed to use correct...

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

diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h
index 9e1d4e0a557ffac111d9cddd9dd0b804118accf4..a9248f7e90a40da24839a92d7c6f2b35647140b9 100644 (file)
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -15,7 +15,7 @@
 #include "wx/bitmap.h"
 
 // Cursor
-class WXDLLEXPORT wxCursor : public wxGDIObject
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
@@ -25,15 +25,14 @@ public:
              const char maskBits[] = NULL);
 
     wxCursor(const wxImage & image) ;
-    wxCursor(const char **bits) ;
-    wxCursor(char **bits) ;
+    wxCursor(const char* const* bits);
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
 
     wxCursor(int cursor_type);
     virtual ~wxCursor();
 
-    bool CreateFromXpm(const char **bits) ;
+    bool CreateFromXpm(const char* const* bits);
 
     void MacInstall() const ;
 
@@ -49,6 +48,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
 
 #endif // _WX_CURSOR_H_