X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31907d03078c41ac09b2ff36267e980c57410f72..dfa4a244f0dabd5319231b281c7b7f11fafc065d:/src/common/wxchar.cpp diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index 7e6c8f21f4..6b2a005483 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -51,6 +51,10 @@ using namespace std ; #endif +#ifdef __WXMAC__ + #include "wx/mac/private.h" +#endif + #if wxUSE_WCHAR_T size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) { @@ -1005,7 +1009,8 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) #ifndef wxStricmp int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n) { - register wxChar c1, c2; + // initialize the variables just to suppress stupid gcc warning + register wxChar c1 = 0, c2 = 0; while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++; if (n) { if (c1 < c2) return -1; @@ -1195,6 +1200,28 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base) } #endif // wxNEED_WX_STRING_H +#if defined(__WXMAC__) && !defined(__DARWIN__) +WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode) +{ + return fopen( wxMacStringToCString(path), mode ); +} + +WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream) +{ + return freopen( wxMacStringToCString(path), mode, stream ); +} + +WXDLLEXPORT int wxRemove(const wxChar *path) +{ + return remove( wxMacStringToCString(path) ); +} + +WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath) +{ + return rename( wxMacStringToCString(oldpath), wxMacStringToCString(newpath) ); +} +#endif + #ifdef wxNEED_WX_STDIO_H WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode) { @@ -1347,3 +1374,20 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt #endif // wxStrtok +// ---------------------------------------------------------------------------- +// missing C RTL functions +// ---------------------------------------------------------------------------- + +#if defined( __MWERKS__ ) && !defined(__MACH__) +#if __MSL__ < 0x00008000 +char *strdup(const char *s) +{ + return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ; +} +#endif +int isascii( int c ) +{ + return ( c >= 0 && c < 128 ) ; +} +#endif // __MWERKS__ +