added wxWindow::Freeze/Thaw(), implemented them for wxGTK::wxTextCtrl

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ff21ca685bf366a61fdb9515fd57f5bdfc8d54de..55cf190209b30d792237bd9d766f0de7c05f77ae 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -63,6 +63,11 @@
         #define wxHAVE_TCHAR_FUNCTIONS
     #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
         #define wxHAVE_TCHAR_FUNCTIONS
+    #elif defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 )
+        #define wxHAVE_TCHAR_FUNCTIONS
+        #include <stddef.h>
+        #include <string.h>
+        #include <ctype.h>
     #endif
 #elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
     // VisualAge 4.0+ supports TCHAR
@@ -116,6 +121,12 @@
 #  include <tchar.h>
 
 #  if wxUSE_UNICODE // temporary - preserve binary compatibility
+#if defined(__GNUWIN32__)
+    #define _TCHAR   TCHAR
+    #define _TSCHAR  TCHAR
+    #define _TUCHAR  TCHAR
+#endif
+
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;
@@ -165,6 +176,7 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxStrcspn   _tcscspn
 #  define  wxStrftime  _tcsftime
 #  define  wxStricmp   _tcsicmp
+#  define  wxStrnicmp  _tcsnicmp
 #  define  wxStrlen_   _tcslen // used in wxStrlen inline function
 #  define  wxStrncat   _tcsncat
 #  define  wxStrncmp   _tcsncmp
@@ -253,7 +265,7 @@ typedef  _TUCHAR     wxUChar;
 #    if defined(__VISUALC__) && (__VISUALC__ < 900)
 #      define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
 #    elif defined(__UNIX__)
-#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
+#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__DARWIN__))
 #        define wxUSE_WCHAR_T 1
 #      else
 #        define wxUSE_WCHAR_T 0
@@ -276,11 +288,11 @@ typedef  _TUCHAR     wxUChar;
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
-#      ifndef __FreeBSD__
-#        include <wchar.h>
-#      else
+#      if defined(__FreeBSD__) || defined(__DARWIN__)
 #        include <stdlib.h>
 #        define wxNEED_WCSLEN
+#      else
+#        include <wchar.h>
 #      endif
 #    endif
 #  endif
@@ -366,7 +378,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #     define wxUChar unsigned char
 #   endif
 
-#   if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
+#   if defined(__FreeBSD__) || defined(__DARWIN__)
 #     undef _T
 #   endif
 
@@ -555,6 +567,10 @@ WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz);
 WXDLLEXPORT int      wxStricmp(const wxChar *psz1, const wxChar *psz2);
 #endif
 
+#ifndef wxStrnicmp
+WXDLLEXPORT int      wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len);
+#endif
+
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
 #endif