X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a6d14383a57771a334f6d0b6376dd47bf24049d..0c14b6c3241d48d9cc36a2fd0aeab0ba330d96de:/src/common/wxcrt.cpp?ds=sidebyside

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 5a114a368d..99982f5e06 100644
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -304,7 +304,7 @@ 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(wx_static_cast(const char*, wxConvLibc.cWX2MB(ws)),
+    return vsscanf(static_cast<const char*>(wxConvLibc.cWX2MB(ws)),
         wxConvLibc.cWX2MB(format), argptr);
 }
 #endif
@@ -797,7 +797,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz)
 #endif // wxCRT_StrdupW
 
 #ifndef wxWCHAR_T_IS_WXCHAR16
-WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s ) 
+size_t wxStrlen(const wxChar16 *s ) 
 { 
     if (!s) return 0; 
     size_t i=0; 
@@ -805,7 +805,7 @@ WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s )
     return i;
 }
 
-WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s)
+wxChar16* wxStrdup(const wxChar16* s)
 { 
   size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); 
   wxChar16 *ret = (wxChar16*) malloc(size);
@@ -815,7 +815,7 @@ WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s)
 #endif
 
 #ifndef wxWCHAR_T_IS_WXCHAR32
-WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s ) 
+size_t wxStrlen(const wxChar32 *s ) 
 { 
     if (!s) return 0; 
     size_t i=0; 
@@ -823,7 +823,7 @@ WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s )
     return i;
 }
 
-WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s)
+wxChar32* wxStrdup(const wxChar32* s)
 { 
   size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); 
   wxChar32 *ret = (wxChar32*) malloc(size);
@@ -1311,15 +1311,15 @@ int wxVsscanf(const char *str, const char *format, va_list ap)
 int wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str, format, ap); }
 int wxVsscanf(const wxCharBuffer& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(wx_static_cast(const char*, str), format, ap); }
+    { return wxCRT_VsscanfA(static_cast<const char*>(str), format, ap); }
 int wxVsscanf(const wxWCharBuffer& str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str, format, ap); }
 int wxVsscanf(const wxString& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(wx_static_cast(const char*, str.mb_str()), format, ap); }
+    { return wxCRT_VsscanfA(static_cast<const char*>(str.mb_str()), format, ap); }
 int wxVsscanf(const wxString& str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str.wc_str(), format, ap); }
 int wxVsscanf(const wxCStrData& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(wx_static_cast(const char*, str.AsCharBuf()), format, ap); }
+    { return wxCRT_VsscanfA(static_cast<const char*>(str.AsCharBuf()), format, ap); }
 int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str.AsWCharBuf(), format, ap); }
 #endif // HAVE_NO_VSSCANF