Sun CC doesn't allow calling static function from template instantiations so rename...

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

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 27285316f91c0028c30e2f8b045244f0ba869c9e..a967694a346a659a6d675be44aa80570b174bdea 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -549,7 +549,7 @@ int wxDoSnprintfUtf8(wchar_t *str, size_t size, const char *format, ...)
 #if wxUSE_UNICODE
 
 #if !wxUSE_UTF8_LOCALE_ONLY
 #if wxUSE_UNICODE
 
 #if !wxUSE_UTF8_LOCALE_ONLY

-static int ConvertStringToBuf(const wxString& s, char *out, size_t outsize)
+int wxInternalConvertStringToBuf(const wxString& s, char *out, size_t outsize)

 {
     const wxWX2WCbuf buf = s.wc_str();
 
 {
     const wxWX2WCbuf buf = s.wc_str();
 


@@ -562,7 +562,7 @@ static int ConvertStringToBuf(const wxString& s, char *out, size_t outsize)
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
 #if wxUSE_UNICODE_UTF8
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
 #if wxUSE_UNICODE_UTF8

-static int ConvertStringToBuf(const wxString& s, wchar_t *out, size_t outsize)
+int wxInternalConvertStringToBuf(const wxString& s, wchar_t *out, size_t outsize)

 {
     const wxWX2WCbuf buf(s.wc_str());
     size_t len = wxWcslen(buf);
 {
     const wxWX2WCbuf buf(s.wc_str());
     size_t len = wxWcslen(buf);


@@ -580,7 +580,7 @@ static size_t PrintfViaString(T *out, size_t outsize,
     wxString s;
     s.PrintfV(format, argptr);
 
     wxString s;
     s.PrintfV(format, argptr);
 

-    return ConvertStringToBuf(s, out, outsize);
+    return wxInternalConvertStringToBuf(s, out, outsize);

 }
 #endif // wxUSE_UNICODE
 
 }
 #endif // wxUSE_UNICODE