From: Ove Kaaven <ovek@arcticnet.no>
Date: Fri, 30 Apr 1999 17:14:48 +0000 (+0000)
Subject: Should compile better if wchar_t is not available.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c50c1ddcb2f0f10dd41f8ec8904a75c3009289f4

Should compile better if wchar_t is not available.


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

diff --git a/include/wx/string.h b/include/wx/string.h
index d9894c0bce..2ad17f4896 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -264,7 +264,11 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 #endif
 #else//!wxUSE_WCHAR_T
 class WXDLLEXPORT wxMBConv {};
-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
+WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
+#define wxConv_libc wxConvLibc
+#define wxConv_file wxConvFile
+WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
+#define wxConv_current wxConvCurrent
 #endif//wxUSE_WCHAR_T
 
 // ---------------------------------------------------------------------------
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 95f21cd712..7ebd317729 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1164,7 +1164,7 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 	    char *val = va_arg(argptr, char *);
 #if wxUSE_UNICODE
 	    // ASCII->Unicode constructor handles max_width right
-	    wxString s(val, wxConv_libc, max_width);
+	    wxString s(val, wxConvLibc, max_width);
 #else
 	    size_t len = wxSTRING_MAXLEN;
 	    if (val) {
@@ -1801,14 +1801,18 @@ void wxArrayString::DoSort()
 // MBConv
 // ============================================================================
 
+WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+#if !wxUSE_WCHAR_T
+WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
+#endif
+
 #if wxUSE_WCHAR_T
-WXDLLEXPORT_DATA(wxMBConv *) wxConv_current = &wxConv_libc;
 
 // ----------------------------------------------------------------------------
 // standard libc conversion
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConv) wxConv_libc;
+WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
 
 size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {