1. changed spelling error in wxTR_HAS_VARIABLE_HEIGHT (missing 'E')

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index d303b6535f58d0cdef5522132878d8f460be6294..7e05283622f938e02eac7612e84526894b1f43f1 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -324,48 +324,7 @@ typedef unsigned char   wxUChar;
 
    // string.h functions
 // #define  wxStricmp   strcasecmp
-
-// Taken from string.h since it tests for platform more correctly
-// portable strcasecmp/_stricmp
-inline int WXDLLEXPORT wxStricmp(const char *psz1, const char *psz2)
-{
-#if     defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) )
-  return _stricmp(psz1, psz2);
-#elif     defined(__SC__)
-  return _stricmp(psz1, psz2);
-#elif     defined(__SALFORDC__)
-  return stricmp(psz1, psz2);
-#elif defined(__BORLANDC__)
-  return stricmp(psz1, psz2);
-#elif defined(__WATCOMC__)
-  return stricmp(psz1, psz2);
-#elif   defined(__UNIX__) || defined(__GNUWIN32__)
-  return strcasecmp(psz1, psz2);
-#elif defined(__MWERKS__) && !defined(__INTEL__)
-  register char c1, c2;
-  do {
-    c1 = tolower(*psz1++);
-    c2 = tolower(*psz2++);
-  } while ( c1 && (c1 == c2) );
-
-  return c1 - c2;
-#else
-  // almost all compilers/libraries provide this function (unfortunately under
-  // different names), that's why we don't implement our own which will surely
-  // be more efficient than this code (uncomment to use):
-  /*
-    register char c1, c2;
-    do {
-      c1 = tolower(*psz1++);
-      c2 = tolower(*psz2++);
-    } while ( c1 && (c1 == c2) );
-
-    return c1 - c2;
-  */
-
-  #error  "Please define string case-insensitive compare for your OS/compiler"
-#endif  // OS/compiler
-}
+// wxStricmp is defined below!!
 
 // #define  wxStrtok    strtok_r // this needs a configure check
 
@@ -571,6 +530,8 @@ WXDLLEXPORT size_t   wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
 #ifdef wxNEED_WX_STDIO_H
 #include <stdio.h>
 #include <stdarg.h>
+WXDLLEXPORT FILE *   wxFopen(const wxChar *path, const wxChar *mode);
+WXDLLEXPORT FILE *   wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
 WXDLLEXPORT int      wxPrintf(const wxChar *fmt, ...);
 WXDLLEXPORT int      wxVprintf(const wxChar *fmt, va_list argptr);
 WXDLLEXPORT int      wxFprintf(FILE *stream, const wxChar *fmt, ...);
@@ -592,5 +553,9 @@ WXDLLEXPORT wxChar * wxGetenv(const wxChar *name);
 WXDLLEXPORT int      wxSystem(const wxChar *psz);
 #endif
 
+#ifdef wxNEED_WX_TIME_H
+WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm);
+#endif
+
 #endif
   //_WX_WXCHAR_H_