Windows compilation fixes after recent changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 4383bd7b8be7f04364b5aec0a7566e19ec986bc0..6b82bc62f406e7755e8c5f88b18cb117799e02e2 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -643,18 +643,18 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use
     int wxVfprintf( FILE *stream, const wxChar *format, va_list ap );
     int wxVprintf( const wxChar *format, va_list ap );
     int wxVsprintf( wxChar *str, const wxChar *format, va_list ap );
     int wxVfprintf( FILE *stream, const wxChar *format, va_list ap );
     int wxVprintf( const wxChar *format, va_list ap );
     int wxVsprintf( wxChar *str, const wxChar *format, va_list ap );

-
-    // these 2 can be simply mapped to the versions with underscore at the end
-    // if we don't have to do the conversion
-    #ifdef wxNEED_PRINTF_CONVERSION
-        int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4;
-        int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
-    #else
-        #define wxSnprintf wxSnprintf_
-        #define wxVsnprintf wxVsnprintf_
-    #endif

 #endif // wxNEED_PRINTF_CONVERSION
 
 #endif // wxNEED_PRINTF_CONVERSION
 

+// these 2 can be simply mapped to the versions with underscore at the end
+// if we don't have to do the conversion
+#ifdef wxNEED_PRINTF_CONVERSION
+    int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4;
+    int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
+#else
+    #define wxSnprintf wxSnprintf_
+    #define wxVsnprintf wxVsnprintf_
+#endif
+

 // ----------------------------------------------------------------------------
 // various functions which might not be available in libc and for which we
 // provide our own replacements in wxchar.cpp
 // ----------------------------------------------------------------------------
 // various functions which might not be available in libc and for which we
 // provide our own replacements in wxchar.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index a95b15e28c8ef5f7b1a12435df32de16d0af9f49..235194fe4607e6d5da73565947e3ec145a3d3eb2 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -244,7 +244,7 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
     // return value excludes NUL
     size_t nLen = pwz ? WC2MB((char *) NULL, pwz, 0) : (size_t)-1;
     if (nLen == (size_t)-1)
     // return value excludes NUL
     size_t nLen = pwz ? WC2MB((char *) NULL, pwz, 0) : (size_t)-1;
     if (nLen == (size_t)-1)

-        return wxCharBuffer(NULL);
+        return wxCharBuffer((const char *)NULL);

 
     wxCharBuffer buf(nLen);                      // this allocates nLen+1
     WC2MB((char *)(const char *) buf, pwz, nLen+1);
 
     wxCharBuffer buf(nLen);                      // this allocates nLen+1
     WC2MB((char *)(const char *) buf, pwz, nLen+1);