always forcing a relayout when position changes, making mlte a system option

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 6e5017ab7ebfdf54199b8f64e0ec003c910512b2..59d7a5e55b0d945c1b9c6e7d2033d330d8e06e50 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -20,6 +20,10 @@
 
 #include "wx/defs.h"        /* for wxUSE_UNICODE */
 
+#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 **);
+#endif
+
 /* check whether we have wchar_t and which size it is if we do */
 #if !defined(wxUSE_WCHAR_T)
     #if defined(__UNIX__)
@@ -371,7 +375,8 @@
     /* #define  wxAtof   _tttof -- notice that there is no such thing (why?) */
     /* there are no env vars at all under CE, so no _tgetenv neither */
     #ifdef __WXWINCE__
-        inline wxChar *wxGetenv(const wxChar *) { return NULL; }
+        /* can't define as inline function as this is a C file... */
+        #define wxGetenv(name)  ((wxChar *)NULL)
     #else
         #define  wxGetenv    _tgetenv
     #endif