X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be329a3de37ac678871cfcce9291b15c4f27d5a2..eaac8805cd0fc233aeb0fc40a31bf8d8e03bf59c:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 62850ac1d1..2c6c414c11 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -54,13 +54,7 @@ #include #include -#if wxUSE_IOSTREAMH -# include -#else -# include -#endif - -#if wxUSE_RICHEDIT && !defined(__GNUWIN32_OLD__) +#if wxUSE_RICHEDIT && (!defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)) #include #endif @@ -1313,6 +1307,10 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) } #if wxUSE_RICHEDIT2 +#ifndef CFM_BACKCOLOR +#define CFM_BACKCOLOR 0x04000000 +#endif + if ( wxRichEditModule::GetLoadedVersion() > 1 && style.HasBackgroundColour() ) { cf.dwMask |= CFM_BACKCOLOR;