correct properties were not set during initial add somehow

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

diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h
index 9dbfe7ebe5acf0f0b68bea3bb0340bb6401abce5..2e7cf5a505d305bffba35bf415f3f1305f5796ca 100644 (file)
--- a/include/wx/wxcrtvararg.h
+++ b/include/wx/wxcrtvararg.h
@@ -70,6 +70,10 @@
     #undef HAVE_VSWPRINTF
 #endif
 
+#if defined(__WATCOMC__)
+    #define HAVE_VSWPRINTF 1
+#endif
+
 #if wxUSE_PRINTF_POS_PARAMS
     /*
         The systems where vsnprintf() supports positional parameters should
@@ -175,16 +179,6 @@
 #define wxCRT_VprintfA       vprintf
 #define wxCRT_VsprintfA      vsprintf
 
-#define  wxCRT_FprintfW      fwprintf
-#define  wxCRT_PrintfW       wprintf
-#define  wxCRT_VfprintfW     vfwprintf
-#define  wxCRT_VprintfW      vwprintf
-
-#if defined(__WINDOWS__) && !HAVE_VSWPRINTF
-// only non-standard vswprintf() without buffer size argument can be used here
-#define  wxCRT_VsprintfW     vswprintf
-#endif
-
 /*
    In Unicode mode we need to have all standard functions such as wprintf() and
    so on but not all systems have them so use our own implementations in this
@@ -206,6 +200,16 @@
     int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list ap );
     int wxCRT_VprintfW( const wchar_t *format, va_list ap );
     int wxCRT_VsprintfW( wchar_t *str, const wchar_t *format, va_list ap );
+#else /* !wxNEED_WPRINTF */
+    #define wxCRT_FprintfW      fwprintf
+    #define wxCRT_PrintfW       wprintf
+    #define wxCRT_VfprintfW     vfwprintf
+    #define wxCRT_VprintfW      vwprintf
+    
+    #if defined(__WINDOWS__) && !defined(HAVE_VSWPRINTF)
+        // only non-standard vswprintf() without buffer size argument can be used here
+        #define  wxCRT_VsprintfW     vswprintf
+    #endif
 #endif /* wxNEED_WPRINTF */
 
 
@@ -221,10 +225,10 @@
     int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...);
     int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap);
 #else
-    #define wxCRT_ScanfW     wscanf
-    #define wxCRT_SscanfW    swscanf
-    #define wxCRT_FscanfW    fwscanf
-    #define wxCRT_VsscanfW   vswscanf
+    #define wxCRT_ScanfW     wxVMS_USE_STD wscanf
+    #define wxCRT_SscanfW    wxVMS_USE_STD swscanf
+    #define wxCRT_FscanfW    wxVMS_USE_STD fwscanf
+    #define wxCRT_VsscanfW   wxVMS_USE_STD vswscanf
 #endif
 
 // ----------------------------------------------------------------------------