added wxCheckListBox::HitTest() (modified patch 594524)

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index f40f6c861b034e9301e1992ba3f2e750b67b83c8..a5a89ea845bedda64f34cd81ed43091f07b5bc94 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -678,7 +678,10 @@ void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly)
     {
         if ( !selectionOnly )
         {
-            SetSelection(-1, -1);
+            //SetSelection(-1, -1);
+            // This eliminates an annoying flashing effect
+            // when replacing all text.
+            Clear();
         }
 
         ::SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)valueDos.c_str());
@@ -1652,6 +1655,8 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 // styling support for rich edit controls
 // ----------------------------------------------------------------------------
 
+#if wxUSE_RICHEDIT
+
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
     if ( !IsRich() )
@@ -1785,6 +1790,21 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
     return ok;
 }
 
+bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+{
+    if ( !wxTextCtrlBase::SetDefaultStyle(style) )
+        return FALSE;
+
+    // we have to do this or the style wouldn't apply for the text typed by the
+    // user
+    long posLast = GetLastPosition();
+    SetStyle(posLast, posLast, m_defaultStyle);
+
+    return TRUE;
+}
+
+#endif
+
 // ----------------------------------------------------------------------------
 // wxRichEditModule
 // ----------------------------------------------------------------------------