another segfault fix

[wxWidgets.git] / src / msw / textctrl.cpp

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index c02095d7621e366c95bd4cc06308014e4594f675..c64bfb06e8f1d7c37eb245124ef9614ae4a207ea 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -91,6 +91,10 @@
     } ENLINK;
 #endif // ENLINK
 
     } ENLINK;
 #endif // ENLINK
 

+#ifndef SF_UNICODE
+    #define SF_UNICODE 0x0010
+#endif
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -464,6 +468,7 @@ extern long wxEncodingToCodepage(wxFontEncoding encoding); // from strconv.cpp
 
 bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
 {
 
 bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
 {

+#if !wxUSE_UNICODE

     // we have to use EM_STREAMIN to force richedit control 2.0+ to show any
     // text in the non default charset - otherwise it thinks it knows better
     // than we do and always shows it in the default one
     // we have to use EM_STREAMIN to force richedit control 2.0+ to show any
     // text in the non default charset - otherwise it thinks it knows better
     // than we do and always shows it in the default one


@@ -487,15 +492,15 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
 
     // finally, stream it in the control
     const wchar_t *wpc = wchBuf;
 
     // finally, stream it in the control
     const wchar_t *wpc = wchBuf;

+#else
+    const wchar_t *wpc = value.c_str();
+#endif

 
     EDITSTREAM eds;
     wxZeroMemory(eds);
     eds.dwCookie = (DWORD)&wpc;
 
     EDITSTREAM eds;
     wxZeroMemory(eds);
     eds.dwCookie = (DWORD)&wpc;

-    eds.pfnCallback = wxRichEditStreamIn;
-
-#ifndef SF_UNICODE
-#define SF_UNICODE 0x0010
-#endif
+    // the cast below is needed for broken (very) old mingw32 headers
+    eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn;

 
     if ( !::SendMessage(GetHwnd(), EM_STREAMIN,
                         SF_TEXT | SF_UNICODE | SFF_SELECTION,
 
     if ( !::SendMessage(GetHwnd(), EM_STREAMIN,
                         SF_TEXT | SF_UNICODE | SFF_SELECTION,