applied patch 430963 (fix for wxRegConfig::SetPath("//foo")

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 62850ac1d1eb9a31ad487dd546d33374744cbef0..2c6c414c115b7229de53e3ca3337ffea276e7a98 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -54,13 +54,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
 #include <stdlib.h>
 #include <sys/types.h>
 

-#if wxUSE_IOSTREAMH
-#   include <fstream.h>
-#else
-#   include <fstream>
-#endif
-
-#if wxUSE_RICHEDIT && !defined(__GNUWIN32_OLD__)
+#if wxUSE_RICHEDIT && (!defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__))

     #include <richedit.h>
 #endif
 
     #include <richedit.h>
 #endif
 


@@ -1313,6 +1307,10 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
     }
 
 #if wxUSE_RICHEDIT2
     }
 
 #if wxUSE_RICHEDIT2

+#ifndef CFM_BACKCOLOR
+#define CFM_BACKCOLOR 0x04000000
+#endif
+

     if ( wxRichEditModule::GetLoadedVersion() > 1 && style.HasBackgroundColour() )
     {
         cf.dwMask |= CFM_BACKCOLOR;
     if ( wxRichEditModule::GetLoadedVersion() > 1 && style.HasBackgroundColour() )
     {
         cf.dwMask |= CFM_BACKCOLOR;