fixed uninitialized wxGridCellAttr::m_defGridAttr (patch 491231)

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index c4803778fedc7295da921f8afb22ea05d18c4efa..7b7d9d905ec2b022c9eab64801783d3a11f46260 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -438,12 +438,16 @@ void wxTextCtrl::SetValue(const wxString& value)
 
         WriteText(value);
 
+        // mark the control as being not dirty - we changed its text, not the
+        // user
+        DiscardEdits();
+
         // for compatibility, don't move the cursor when doing SetValue()
         SetInsertionPoint(0);
     }
 }
 
-#if wxUSE_RICHEDIT
+#if wxUSE_RICHEDIT && !wxUSE_UNICODE
 
 DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
 {
@@ -529,6 +533,7 @@ void wxTextCtrl::WriteText(const wxString& value)
             SetStyle(start, end, m_defaultStyle );
         }
 
+#if !wxUSE_UNICODE
         // next check if the text we're inserting must be shown in a non
         // default charset -- this only works for RichEdit > 1.0
         if ( GetRichVersion() > 1 )
@@ -546,6 +551,7 @@ void wxTextCtrl::WriteText(const wxString& value)
                }
             }
         }
+#endif // !wxUSE_UNICODE
     }
 
     if ( !done )