fixes to

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index b19e84b06f029e636d12b02ea81284f2b4fd7eb1..200b599bf4f33cbbc35a7904a52dbe76b54578dd 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -493,11 +493,7 @@ void wxTextCtrl::SetValue(const wxString& value)
     // edit controls mostly)
     if ( (value.length() > 0x400) || (value != GetValue()) )
     {
     // edit controls mostly)
     if ( (value.length() > 0x400) || (value != GetValue()) )
     {

-        // it is simpler to do this but it could be more efficient to reproduce
-        // WriteText() logic here
-        Clear();
-
-        WriteText(value);
+        DoWriteText(value, FALSE /* not selection only */);

 
         // mark the control as being not dirty - we changed its text, not the
         // user
 
         // mark the control as being not dirty - we changed its text, not the
         // user


@@ -532,11 +528,15 @@ DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
 extern long wxEncodingToCodepage(wxFontEncoding encoding); // from strconv.cpp
 
 #if wxUSE_UNICODE_MSLU
 extern long wxEncodingToCodepage(wxFontEncoding encoding); // from strconv.cpp
 
 #if wxUSE_UNICODE_MSLU

-bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding WXUNUSED(encoding))
+bool wxTextCtrl::StreamIn(const wxString& value,
+                          wxFontEncoding WXUNUSED(encoding),
+                          bool selectionOnly)

 {
     const wchar_t *wpc = value.c_str();
 {
     const wchar_t *wpc = value.c_str();

-#else
-bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
+#else // !wxUSE_UNICODE_MSLU
+bool wxTextCtrl::StreamIn(const wxString& value,
+                          wxFontEncoding encoding,
+                          bool selectionOnly)

 {
     // we have to use EM_STREAMIN to force richedit control 2.0+ to show any
     // text in the non default charset - otherwise it thinks it knows better
 {
     // we have to use EM_STREAMIN to force richedit control 2.0+ to show any
     // text in the non default charset - otherwise it thinks it knows better


@@ -552,9 +552,15 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
 
     // next translate to Unicode using this code page
     int len = ::MultiByteToWideChar(codepage, 0, value, -1, NULL, 0);
 
     // next translate to Unicode using this code page
     int len = ::MultiByteToWideChar(codepage, 0, value, -1, NULL, 0);

+
+#if wxUSE_WCHAR_T

     wxWCharBuffer wchBuf(len);
     wxWCharBuffer wchBuf(len);

+#else
+    wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
+#endif
+

     if ( !::MultiByteToWideChar(codepage, 0, value, -1,
     if ( !::MultiByteToWideChar(codepage, 0, value, -1,

-                                (wchar_t *)wchBuf.data(), len) )
+                                (wchar_t *)(const wchar_t *)wchBuf, len) )

     {
         wxLogLastError(_T("MultiByteToWideChar"));
     }
     {
         wxLogLastError(_T("MultiByteToWideChar"));
     }


@@ -570,20 +576,29 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding)
     eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn;
 
     if ( !::SendMessage(GetHwnd(), EM_STREAMIN,
     eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn;
 
     if ( !::SendMessage(GetHwnd(), EM_STREAMIN,

-                        SF_TEXT | SF_UNICODE | SFF_SELECTION,
+                        SF_TEXT |
+                        SF_UNICODE |
+                        (selectionOnly ? SFF_SELECTION : 0),

                         (LPARAM)&eds) || eds.dwError )
     {
         wxLogLastError(_T("EM_STREAMIN"));
                         (LPARAM)&eds) || eds.dwError )
     {
         wxLogLastError(_T("EM_STREAMIN"));

-
-        return FALSE;

     }
 
     }
 

+#if !wxUSE_WCHAR_T
+    free(wchBuf);
+#endif // !wxUSE_WCHAR_T
+

     return TRUE;
 }
 
 #endif // wxUSE_RICHEDIT
 
 void wxTextCtrl::WriteText(const wxString& value)
     return TRUE;
 }
 
 #endif // wxUSE_RICHEDIT
 
 void wxTextCtrl::WriteText(const wxString& value)

+{
+    DoWriteText(value);
+}
+
+void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly)

 {
     wxString valueDos;
     if ( m_windowStyle & wxTE_MULTILINE )
 {
     wxString valueDos;
     if ( m_windowStyle & wxTE_MULTILINE )


@@ -609,7 +624,7 @@ void wxTextCtrl::WriteText(const wxString& value)
         // but EM_STREAMIN works
         if ( wxGetOsVersion() == wxWIN95 && GetRichVersion() > 1 )
         {
         // but EM_STREAMIN works
         if ( wxGetOsVersion() == wxWIN95 && GetRichVersion() > 1 )
         {

-           done = StreamIn(valueDos, wxFONTENCODING_SYSTEM);
+           done = StreamIn(valueDos, wxFONTENCODING_SYSTEM, selectionOnly);

         }
 #endif // wxUSE_UNICODE_MSLU
 
         }
 #endif // wxUSE_UNICODE_MSLU
 


@@ -627,7 +642,7 @@ void wxTextCtrl::WriteText(const wxString& value)
                wxFontEncoding encoding = font.GetEncoding();
                if ( encoding != wxFONTENCODING_SYSTEM )
                {
                wxFontEncoding encoding = font.GetEncoding();
                if ( encoding != wxFONTENCODING_SYSTEM )
                {

-                   done = StreamIn(valueDos, encoding);
+                   done = StreamIn(valueDos, encoding, selectionOnly);

                }
             }
         }
                }
             }
         }


@@ -637,6 +652,11 @@ void wxTextCtrl::WriteText(const wxString& value)
     if ( !done )
 #endif // wxUSE_RICHEDIT
     {
     if ( !done )
 #endif // wxUSE_RICHEDIT
     {

+        if ( !selectionOnly )
+        {
+            SetSelection(-1, -1);
+        }
+

         ::SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)valueDos.c_str());
     }
 
         ::SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)valueDos.c_str());
     }
 


@@ -1681,18 +1701,18 @@ bool wxRichEditModule::Load(int version)
     // make it the index in the array
     version--;
 
     // make it the index in the array
     version--;
 

-    if ( ms_hRichEdit[version] )
-    {
-        // we've already got this one
-        return TRUE;
-    }
-

     if ( ms_hRichEdit[version] == (HINSTANCE)-1 )
     {
         // we had already tried to load it and failed
         return FALSE;
     }
 
     if ( ms_hRichEdit[version] == (HINSTANCE)-1 )
     {
         // we had already tried to load it and failed
         return FALSE;
     }
 

+    if ( ms_hRichEdit[version] )
+    {
+        // we've already got this one
+        return TRUE;
+    }
+

     wxString dllname = version ? _T("riched20") : _T("riched32");
     dllname += _T(".dll");
 
     wxString dllname = version ? _T("riched20") : _T("riched32");
     dllname += _T(".dll");