Patch #1735 2006-12-18 23:31

stahta01

pipedprocess patch for wxWidgets 2.8
Download
1735-pipedprocess_p.patch (690 bytes)
Category
Plugin::Refinement
Status
Closed
Close date
2006-12-27 12:35
Assigned to
killerbot
Index: src/sdk/pipedprocess.cpp
===================================================================
--- src/sdk/pipedprocess.cpp    (revision 3173)
+++ src/sdk/pipedprocess.cpp    (working copy)
@@ -75,7 +75,11 @@
                     return wxEOT;
                 if (m_allowMBconversion)
                 {
+#if wxCHECK_VERSION(2, 8, 0)
+                    int retlen = (int) m_conv->MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
+#else
                     int retlen = (int) m_conv.MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
+#endif
                     if(retlen >= 0) // res == 0 could happen for '\0' char
                         return wbuf[0];
                 }

History

stahta01 2006-12-18 23:39

Change: wx/txtstrm.h defines m_conv variable as a wxMBConv *m_conv;

Problem: It was defined as wxMBConv &m_conv; in 2.6.3; this resulted in issues with this call m_conv.MB2WC.

Solution: Changed m_conv.MB2WC to m_conv->MB2WC.

Tim S

killerbot 2006-12-27 12:35

applied rev 3430