From 4d8a4ee70f8138893c711aa30018bd3a43c79b69 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 7 Oct 2013 16:06:08 +0000 Subject: [PATCH] build fix for wxUSE_UNICODE==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/utilscmn.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index b70f18f5a2..da02376e24 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -633,7 +633,11 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output) // Notice that wxTextInputStream doesn't work correctly with wxConvAuto // currently, see #14720, so use the current locale conversion explicitly // under assumption that any external program should be using it too. - wxTextInputStream tis(*is, " \t", wxConvLibc); + wxTextInputStream tis(*is, " \t" +#if wxUSE_UNICODE + , wxConvLibc +#endif + ); for ( ;; ) {