remove wxTextAttr::CreateFont(); return wxNullFont from GetFont() if we have no font...

[wxWidgets.git] / src / common / wxcrt.cpp

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 84bf3e438c9ae9858578a2bdbe6d2d8fab730392..6f3377d6cd3e7b13ed557280e27d5e9164fbef1b 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -325,7 +325,8 @@ static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
     wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1,
                  _T("incomplete vswscanf implementation doesn't allow %c") );
 
-    return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argptr);
+    return vsscanf(wx_static_cast(const char*, wxConvLibc.cWX2MB(ws)),
+        wxConvLibc.cWX2MB(format), argptr);
 }
 #endif