[start of] cleanup uxtheme support code

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index d03f72b05914f8352d7d9e4ee046144e7c11d09d..1809db0dc5c924200b38a842076fc56c427e0c96 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -339,8 +339,12 @@
         #define  wxRemove    wxMSLU__tremove
         #define  wxRename    wxMSLU__trename
     #else
         #define  wxRemove    wxMSLU__tremove
         #define  wxRename    wxMSLU__trename
     #else

-        #define  wxRemove    _tremove
-        #define  wxRename    _trename
+        #ifdef __WXWINCE__
+            #define  wxRemove    DeleteFile
+        #else
+            #define  wxRemove    _tremove
+            #define  wxRename    _trename
+        #endif

     #endif
 
     // stdlib.h functions
     #endif
 
     // stdlib.h functions


@@ -576,11 +580,19 @@
         #define  wxStrxfrm   strxfrm
 
         // stdio.h functions
         #define  wxStrxfrm   strxfrm
 
         // stdio.h functions

+        #if defined(__WXMAC__) && !defined(__DARWIN__)
+        #include <stdio.h>
+        WXDLLIMPEXP_BASE FILE *   wxFopen(const wxChar *path, const wxChar *mode);
+        WXDLLIMPEXP_BASE FILE *   wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
+        WXDLLIMPEXP_BASE int      wxRemove(const wxChar *path);
+        WXDLLIMPEXP_BASE int      wxRename(const wxChar *oldpath, const wxChar *newpath);
+        #else

         #define  wxFopen     fopen
         #define  wxFreopen   freopen
         #define  wxFopen     fopen
         #define  wxFreopen   freopen

-        #define  wxPerror    perror

         #define  wxRemove    remove
         #define  wxRename    rename
         #define  wxRemove    remove
         #define  wxRename    rename

+        #endif
+        #define  wxPerror    perror

         #define  wxTmpnam    tmpnam
 
         #define  wxFgetc     fgetc
         #define  wxTmpnam    tmpnam
 
         #define  wxFgetc     fgetc


@@ -915,6 +927,17 @@ WXDLLIMPEXP_BASE int      wxSystem(const wxChar *psz);
                                   const wxChar *fmt, const struct tm *tm);
 #endif // wxNEED_WX_TIME_H
 
                                   const wxChar *fmt, const struct tm *tm);
 #endif // wxNEED_WX_TIME_H
 

+// missing functions in WinCE
+#ifdef __WXWINCE__
+WXDLLIMPEXP_BASE char* strdup(const char* s);
+WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
+
+#if _WIN32_WCE <= 211
+WXDLLIMPEXP_BASE int isspace(int c);
+WXDLLIMPEXP_BASE int isascii( int c );
+#endif
+#endif
+

 // ----------------------------------------------------------------------------
 // multibyte to wide char conversion functions and macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // multibyte to wide char conversion functions and macros
 // ----------------------------------------------------------------------------