Patch from Hartwig (use new GetChildren() API)

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

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index e9f28d43ccd695ecf7e6f68b2d19f87c3409fb89..0afdc2ec5c15bd1ea7f9b69a5386370ce5d9efde 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -2,7 +2,7 @@
  * Name:        wx/wxcrtbase.h
  * Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
  *              CRT functions
  * Name:        wx/wxcrtbase.h
  * Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
  *              CRT functions

- * Author:      Joel Farley, Ove Kåven
+ * Author:      Joel Farley, Ove K�ven

  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$


@@ -34,6 +34,9 @@
 #include <wctype.h>
 #include <time.h>
 
 #include <wctype.h>
 #include <time.h>
 

+#if defined(__WINDOWS__) && !defined(__WXWINCE__)
+    #include <io.h>
+#endif

 
 #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     char *strtok_r(char *, const char *, char **);
 
 #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     char *strtok_r(char *, const char *, char **);


@@ -129,7 +132,6 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #define wxCRT_StrcatA    strcat
 #define wxCRT_StrchrA    strchr
 #define wxCRT_StrcmpA    strcmp
 #define wxCRT_StrcatA    strcat
 #define wxCRT_StrchrA    strchr
 #define wxCRT_StrcmpA    strcmp

-#define wxCRT_StrcollA   strcoll

 #define wxCRT_StrcpyA    strcpy
 #define wxCRT_StrcspnA   strcspn
 #define wxCRT_StrlenA    strlen
 #define wxCRT_StrcpyA    strcpy
 #define wxCRT_StrcspnA   strcspn
 #define wxCRT_StrlenA    strlen


@@ -140,12 +142,10 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #define wxCRT_StrrchrA   strrchr
 #define wxCRT_StrspnA    strspn
 #define wxCRT_StrstrA    strstr
 #define wxCRT_StrrchrA   strrchr
 #define wxCRT_StrspnA    strspn
 #define wxCRT_StrstrA    strstr

-#define wxCRT_StrxfrmA   strxfrm

 
 #define wxCRT_StrcatW    wcscat
 #define wxCRT_StrchrW    wcschr
 #define wxCRT_StrcmpW    wcscmp
 
 #define wxCRT_StrcatW    wcscat
 #define wxCRT_StrchrW    wcschr
 #define wxCRT_StrcmpW    wcscmp

-#define wxCRT_StrcollW   wcscoll

 #define wxCRT_StrcpyW    wcscpy
 #define wxCRT_StrcspnW   wcscspn
 #define wxCRT_StrncatW   wcsncat
 #define wxCRT_StrcpyW    wcscpy
 #define wxCRT_StrcspnW   wcscspn
 #define wxCRT_StrncatW   wcsncat


@@ -155,7 +155,15 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #define wxCRT_StrrchrW   wcsrchr
 #define wxCRT_StrspnW    wcsspn
 #define wxCRT_StrstrW    wcsstr
 #define wxCRT_StrrchrW   wcsrchr
 #define wxCRT_StrspnW    wcsspn
 #define wxCRT_StrstrW    wcsstr

-#define wxCRT_StrxfrmW   wcsxfrm
+
+/* these functions are not defined under CE, at least in VC8 CRT */
+#ifndef __WXWINCE__
+    #define wxCRT_StrcollA   strcoll
+    #define wxCRT_StrxfrmA   strxfrm
+
+    #define wxCRT_StrcollW   wcscoll
+    #define wxCRT_StrxfrmW   wcsxfrm
+#endif /* __WXWINCE__ */

 
 /* Almost all compiler have strdup(), but not quite all: CodeWarrior under
    Mac and VC++ for Windows CE don't provide it; additionally, gcc under
 
 /* Almost all compiler have strdup(), but not quite all: CodeWarrior under
    Mac and VC++ for Windows CE don't provide it; additionally, gcc under


@@ -167,7 +175,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #endif
 #if defined(__WINDOWS__)
     #define wxCRT_StrdupW _wcsdup
 #endif
 #if defined(__WINDOWS__)
     #define wxCRT_StrdupW _wcsdup

-#elif !defined(__DARWIN__) && !defined( __VMS )
+#elif defined(HAVE_WCSDUP)

     #define wxCRT_StrdupW wcsdup
 #endif
 
     #define wxCRT_StrdupW wcsdup
 #endif
 


@@ -369,14 +377,24 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
 #endif
 
 /* supply strtoll and strtoull, if needed */
 #endif
 
 /* supply strtoll and strtoull, if needed */

-#ifndef wxCRT_StrtollA
-    WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollA(const char* nptr, char** endptr, int base);
-    WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullA(const char* nptr, char** endptr, int base);
-#endif
-#ifndef wxCRT_StrtollW
-    WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr, wchar_t** endptr, int base);
-    WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base);
-#endif
+#ifdef wxLongLong_t
+    #ifndef wxCRT_StrtollA
+        WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollA(const char* nptr,
+                                                     char** endptr,
+                                                     int base);
+        WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullA(const char* nptr,
+                                                       char** endptr,
+                                                       int base);
+    #endif
+    #ifndef wxCRT_StrtollW
+        WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr,
+                                                     wchar_t** endptr,
+                                                     int base);
+        WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr,
+                                                       wchar_t** endptr,
+                                                       int base);
+    #endif
+#endif // wxLongLong_t

 
 
 /* -------------------------------------------------------------------------
 
 
 /* -------------------------------------------------------------------------


@@ -400,7 +418,6 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
     #define wxCRT_Rename  rename
 
 #else /* Unicode filenames */
     #define wxCRT_Rename  rename
 
 #else /* Unicode filenames */

-

     /* special case: these functions are missing under Win9x with Unicows so we
        have to implement them ourselves */
     #if wxUSE_UNICODE_MSLU
     /* special case: these functions are missing under Win9x with Unicows so we
        have to implement them ourselves */
     #if wxUSE_UNICODE_MSLU


@@ -413,17 +430,17 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
             #define wxCRT_Remove    wxMSLU__wremove
             #define wxCRT_Rename    wxMSLU__wrename
     #else
             #define wxCRT_Remove    wxMSLU__wremove
             #define wxCRT_Rename    wxMSLU__wrename
     #else

-        #define wxCRT_Rename   _wrename
-        #define wxCRT_Fopen    _wfopen
-        #define wxCRT_Freopen  _wfreopen
+        /* WinCE CRT doesn't provide these functions so use our own */

         #ifdef __WXWINCE__
         #ifdef __WXWINCE__

-            /* carefully: wxCRT_Remove() must return 0 on success while
-               DeleteFile() returns 0 on error, so don't just define one as
-               the other */
-            int wxCRT_Remove(const wchar_t *path);
+            WXDLLIMPEXP_BASE int wxCRT_Rename(const wchar_t *src,
+                                              const wchar_t *dst);
+            WXDLLIMPEXP_BASE int wxCRT_Remove(const wchar_t *path);

         #else
         #else

+            #define wxCRT_Rename   _wrename

             #define wxCRT_Remove _wremove
         #endif
             #define wxCRT_Remove _wremove
         #endif

+        #define wxCRT_Fopen    _wfopen
+        #define wxCRT_Freopen  _wfreopen

     #endif
 
 #endif /* wxMBFILES/!wxMBFILES */
     #endif
 
 #endif /* wxMBFILES/!wxMBFILES */


@@ -463,20 +480,23 @@ WXDLLIMPEXP_BASE int wxCRT_FputsW(const wchar_t *ch, FILE *stream);
 WXDLLIMPEXP_BASE int wxCRT_FputcW(wchar_t wc, FILE *stream);
 #endif
 
 WXDLLIMPEXP_BASE int wxCRT_FputcW(wchar_t wc, FILE *stream);
 #endif
 

-#define wxCRT_TmpnamA     tmpnam
-#ifdef _ttmpnam
-    #define wxCRT_TmpnamW _wtmpnam
-#endif
+/*
+   NB: tmpnam() is unsafe and thus is not wrapped!
+       Use other wxWidgets facilities instead:
+        wxFileName::CreateTempFileName, wxTempFile, or wxTempFileOutputStream
+*/
+#define wxTmpnam(x)         wxTmpnam_is_insecure_use_wxTempFile_instead

 
 

-#ifndef wxCRT_TmpnamW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_TmpnamW(wchar_t *s);
-#endif
+/* FIXME-CE: provide our own perror() using ::GetLastError() */
+#ifndef __WXWINCE__

 
 #define wxCRT_PerrorA   perror
 #ifdef wxHAVE_TCHAR_SUPPORT
     #define wxCRT_PerrorW _wperror
 #endif
 
 
 #define wxCRT_PerrorA   perror
 #ifdef wxHAVE_TCHAR_SUPPORT
     #define wxCRT_PerrorW _wperror
 #endif
 

+#endif /* !__WXWINCE__ */
+

 /* -------------------------------------------------------------------------
                                   stdlib.h
    ------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------
                                   stdlib.h
    ------------------------------------------------------------------------- */


@@ -484,8 +504,8 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_TmpnamW(wchar_t *s);
 /* there are no env vars at all under CE, so no _tgetenv neither */
 #ifdef __WXWINCE__
     /* can't define as inline function as this is a C file... */
 /* there are no env vars at all under CE, so no _tgetenv neither */
 #ifdef __WXWINCE__
     /* can't define as inline function as this is a C file... */

-    #define wxCRT_GetenvA(name)     ((char*)NULL)
-    #define wxCRT_GetenvW(name)     ((wchar_t*)NULL)
+    #define wxCRT_GetenvA(name)     (name, NULL)
+    #define wxCRT_GetenvW(name)     (name, NULL)

 #else
     #define wxCRT_GetenvA           getenv
     #ifdef _tgetenv
 #else
     #define wxCRT_GetenvA           getenv
     #ifdef _tgetenv