aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk26/files
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2005-11-08 07:28:39 +0000
committerMax Khon <fjoe@FreeBSD.org>2005-11-08 07:28:39 +0000
commit31a8351b98bb6c70ae0786f55eea4b624d6bbce6 (patch)
treee9db7b6806918ebd3b748aa79f4a20364f5be362 /x11-toolkits/wxgtk26/files
parent3bbf3779bf14229965d330a9f5a23f8c7669fca3 (diff)
downloadports-31a8351b98bb6c70ae0786f55eea4b624d6bbce6.tar.gz
ports-31a8351b98bb6c70ae0786f55eea4b624d6bbce6.zip
Add a patch from WX_2_6_BRANCH:
src/common/intl.cpp rev. 1.166.2.1: backported fix for crash in Unicode build (bug 1303851) Submitted by: mux
Notes
Notes: svn path=/head/; revision=147546
Diffstat (limited to 'x11-toolkits/wxgtk26/files')
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
new file mode 100644
index 000000000000..12488d2b710e
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
+retrieving revision 1.166
+retrieving revision 1.166.2.1
+diff -u -r1.166 -r1.166.2.1
+--- src/common/intl.cpp 2005/09/18 23:38:06 1.166
++++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1
+@@ -1260,9 +1260,14 @@
+ inputConv =
+ csConv = new wxCSConv(m_charset);
+ }
+- else // no conversion needed
++ else // no need to convert the encoding
+ {
++ // we still need the conversion for Unicode build
++#if wxUSE_UNICODE
++ inputConv = wxConvCurrent;
++#else // !wxUSE_UNICODE
+ inputConv = NULL;
++#endif
+ }
+
+ // conversion to apply to msgid strings before looking them up: we only