fix for my old and broken mingw32 headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,6 +91,10 @@
|
|||||||
} ENLINK;
|
} ENLINK;
|
||||||
#endif // ENLINK
|
#endif // ENLINK
|
||||||
|
|
||||||
|
#ifndef SF_UNICODE
|
||||||
|
#define SF_UNICODE 0x0010
|
||||||
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// private functions
|
// private functions
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -491,11 +495,8 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
|
|||||||
EDITSTREAM eds;
|
EDITSTREAM eds;
|
||||||
wxZeroMemory(eds);
|
wxZeroMemory(eds);
|
||||||
eds.dwCookie = (DWORD)&wpc;
|
eds.dwCookie = (DWORD)&wpc;
|
||||||
eds.pfnCallback = wxRichEditStreamIn;
|
// the cast below is needed for broken (very) old mingw32 headers
|
||||||
|
eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn;
|
||||||
#ifndef SF_UNICODE
|
|
||||||
#define SF_UNICODE 0x0010
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ( !::SendMessage(GetHwnd(), EM_STREAMIN,
|
if ( !::SendMessage(GetHwnd(), EM_STREAMIN,
|
||||||
SF_TEXT | SF_UNICODE | SFF_SELECTION,
|
SF_TEXT | SF_UNICODE | SFF_SELECTION,
|
||||||
|
Reference in New Issue
Block a user