fixed bug in DeleteEntry()

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 1809db0dc5c924200b38a842076fc56c427e0c96..6dadaecf49bea4306685d0d2df75557a7b3d9acf 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "wxchar.h"
 #endif
 
     #pragma interface "wxchar.h"
 #endif
 


@@ -131,6 +131,8 @@
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
     #define wxHAVE_TCHAR_SUPPORT
     #include <ctype.h>
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
     #define wxHAVE_TCHAR_SUPPORT
     #include <ctype.h>

+#elif defined(__WATCOMC__)
+    #define wxHAVE_TCHAR_SUPPORT

 #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>
 #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>


@@ -508,7 +510,7 @@
             // time.h functions
             #define  wxAsctime   wasciitime
             #define  wxCtime     wctime
             // time.h functions
             #define  wxAsctime   wasciitime
             #define  wxCtime     wctime

-            #define  wxStrftime  wcsftime
+            // #define  wxStrftime  wcsftime

 
             /*
             #define wxNEED_FPUTWC
 
             /*
             #define wxNEED_FPUTWC


@@ -527,8 +529,8 @@
             // use our own versions
             #define wxNEED_WX_STDIO_H
             #define wxNEED_WX_STDLIB_H
             // use our own versions
             #define wxNEED_WX_STDIO_H
             #define wxNEED_WX_STDLIB_H

-            #define wxNEED_WX_TIME_H

             */
             */

+            #define wxNEED_WX_TIME_H

         #else // !metrowerks for apple
             #error  "Please define wide character functions for your environment"
         #endif
         #else // !metrowerks for apple
             #error  "Please define wide character functions for your environment"
         #endif


@@ -580,18 +582,11 @@
         #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  wxRemove    remove
         #define  wxRename    rename
         #define  wxFopen     fopen
         #define  wxFreopen   freopen
         #define  wxRemove    remove
         #define  wxRename    rename

-        #endif
+

         #define  wxPerror    perror
         #define  wxTmpnam    tmpnam
 
         #define  wxPerror    perror
         #define  wxTmpnam    tmpnam
 


@@ -599,6 +594,7 @@
         #define  wxFgetchar  fgetchar
         #define  wxFgets     fgets
         #define  wxFputc     fputc
         #define  wxFgetchar  fgetchar
         #define  wxFgets     fgets
         #define  wxFputc     fputc

+        #define  wxFputs     fputs

         #define  wxFputchar  fputchar
         #define  wxFprintf   fprintf
         #define  wxFscanf    fscanf
         #define  wxFputchar  fputchar
         #define  wxFprintf   fprintf
         #define  wxFscanf    fscanf