X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42d11c8e66149da692edaddcffc4c67cfa7ca496..016b064360b6018058a1c1cff688a055425956b1:/src/common/wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 8353277d16..06c69bd0cd 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "wxchar.h"
 #endif
 
@@ -1205,28 +1205,6 @@ 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)
 {
@@ -1305,7 +1283,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
     // printf( "home %s\n", val );
 
     // convert it,
-#ifdef wxUSE_UNICODE
+#if wxUSE_UNICODE
     data = (wxObject *)new wxString(val, wxConvLocal);
 #else
     data = (wxObject *)new wxString(val);
@@ -1411,19 +1389,20 @@ int isascii( int c )
 }
 #endif
 
-#if defined(__WXWINCE__)
+#if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
+#if (_WIN32_WCE < 300)
 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
     memset( ptr, 0, num * size);
     return ptr;
 }
+#endif
 
-#if (_WIN32_WCE <= 211)
 int isspace(int c)
 {
     return (c == ' ');
 }
-#endif
 
 #endif
+