added SetColMinimalWidth()

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 53ff323588dc04a33dc09b31cfb65d8ba81b6b8f..91103040c6a5d1814f271dce0fd61ef70d039ebd 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -61,6 +61,44 @@
     #define wxNO_TCHAR_STDIO
     #define wxNO_TCHAR_STDLIB
     #define wxNO_TCHAR_TIME
+    #define wxNO_TCHAR_LOCALE
+    //
+    // supplemental VA V4 defs so at least we know what these are
+    // just define to standard defs
+    //
+
+    // for wcslen
+    #include <wchar.h>
+
+    // locale.h functons -- not defined in tchar.h
+    #define  wxSetlocale setlocale
+    // some stdio functions are defined others are not
+    // these are not
+    #define  wxFgetchar  fgetchar
+    #define  wxFopen     fopen
+    #define  wxFputchar  fputchar
+    #define  wxFreopen   freopen
+    #define  wxGets      gets
+    #define  wxPerror    perror
+    #define  wxPuts      puts
+    #define  wxRemove    remove
+    #define  wxRename    rename
+    #define  wxTmpnam    tmpnam
+    #define  wxUngetc    ungetc
+    #define  wxVsscanf   vsscanf
+    // stdlib not defined in VA V4
+    #if !wxUSE_UNICODE
+    #  define  wxAtof      atof
+    #endif
+    #define  wxAtoi      atoi
+    #define  wxAtol      atol
+    #define  wxGetenv    getenv
+    #define  wxSystem    system
+    // time.h functions  -- none defined in tchar.h
+    #define  wxAsctime   asctime
+    #define  wxCtime     ctime
+
+
 #endif
 
 #ifdef wxHAVE_TCHAR_FUNCTIONS
@@ -83,6 +121,9 @@ typedef  _TUCHAR     wxUChar;
 
    // ctype.h functions
 #ifndef wxNO_TCHAR_CTYPE
+#ifdef __BORLANDC__
+#  include <ctype.h>
+#endif
 #  define  wxIsalnum   _istalnum
 #  define  wxIsalpha   _istalpha
 #  define  wxIsctrl    _istctrl
@@ -157,7 +198,7 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxVprintf   _vtprintf
 #  define  wxVsscanf   _vstscanf
 #  define  wxVsprintf  _vstprintf
-#elif defined(__VISAGECPP__)
+#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
     // it has some stdio.h functions, apparently
 #  define  wxFgetc     _fgettc
 #  define  wxFgets     _fgetts
@@ -215,6 +256,8 @@ typedef  _TUCHAR     wxUChar;
 #      define wxUSE_WCHAR_T 0
 #    elif defined(__WATCOMC__)
 #      define wxUSE_WCHAR_T 0
+#    elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+#      define wxUSE_WCHAR_T 1
 #    else
   // add additional compiler checks if this fails
 #      define wxUSE_WCHAR_T 1
@@ -509,6 +552,7 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 #endif
 
 #ifndef wxSetlocale
+class wxWCharBuffer;
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
 #endif