api uniformity between tabart and dockart

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 4f4dc9b485ed8ba68a7d96b625df13bba08847b8..c76b7d7a210004c6241c0e9ecc1e8b995bc9111d 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -323,7 +323,7 @@
     #define  wxStrtol    _tcstol
     #define  wxStrtoul   _tcstoul
     #ifdef __VISUALC__
     #define  wxStrtol    _tcstol
     #define  wxStrtoul   _tcstoul
     #ifdef __VISUALC__

-        #if __VISUALC__ >= 1300
+        #if __VISUALC__ >= 1300 && !defined(__WXWINCE__)

             #define wxStrtoll  _tcstoi64
             #define wxStrtoull _tcstoui64
         #endif /* VC++ 7+ */
             #define wxStrtoll  _tcstoi64
             #define wxStrtoull _tcstoui64
         #endif /* VC++ 7+ */


@@ -913,7 +913,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
             The only compiler with positional parameters support under Windows
             is VC++ 8.0 which provides a new xxprintf_p() functions family
          */
             The only compiler with positional parameters support under Windows
             is VC++ 8.0 which provides a new xxprintf_p() functions family
          */

-        #if defined(__VISUALC__) && __VISUALC__ >= 1400
+        #if defined(__VISUALC__) && __VISUALC__ >= 1400 && !defined(__WXWINCE__)

             #if wxUSE_UNICODE
                 #define wxVsnprintf_    _vswprintf_p
             #else
             #if wxUSE_UNICODE
                 #define wxVsnprintf_    _vswprintf_p
             #else