bitmap and image updates

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e953ec4e7daf80a3dc9d8ed8cdf68d7a1232ae4f..86967c3addf82400e9efaa1eb9c83270229c3739 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -33,11 +33,12 @@
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"

+    #include "wx/intl.h"

     #include "wx/log.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif
 
 #if wxUSE_CLIPBOARD
 #endif
 
 #if wxUSE_CLIPBOARD

-    #include "wx/app.h"

     #include "wx/clipbrd.h"
 #endif
 
     #include "wx/clipbrd.h"
 #endif
 


@@ -57,7 +58,7 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

-#if wxUSE_RICHEDIT && !defined(__GNUWIN32__)
+#if wxUSE_RICHEDIT

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


@@ -115,7 +116,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 

-    SetValidator(validator);

     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);
 


@@ -128,15 +128,20 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),

-                      _T("wxTE_PROCESS_ENTER style is ignored for multiline "
-                         "text controls (they always process it)") );
+                      wxT("wxTE_PROCESS_ENTER style is ignored for multiline "
+                          "text controls (they always process it)") );

 
 

-        msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL;
+        msStyle |= ES_MULTILINE | ES_WANTRETURN;
+        if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
+            msStyle |= WS_VSCROLL;

         m_windowStyle |= wxTE_PROCESS_ENTER;
     }
     else
         msStyle |= ES_AUTOHSCROLL;
 
         m_windowStyle |= wxTE_PROCESS_ENTER;
     }
     else
         msStyle |= ES_AUTOHSCROLL;
 

+    if (m_windowStyle & wxHSCROLL)
+        msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL);
+

     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;
 
     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;
 


@@ -161,14 +166,37 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         m_lDlgCode |= DLGC_WANTTAB;
 
     // do create the control - either an EDIT or RICHEDIT
         m_lDlgCode |= DLGC_WANTTAB;
 
     // do create the control - either an EDIT or RICHEDIT

-    const wxChar *windowClass = _T("EDIT");
+    const wxChar *windowClass = wxT("EDIT");

 
 #if wxUSE_RICHEDIT
     if ( m_windowStyle & wxTE_RICH )
     {
 
 #if wxUSE_RICHEDIT
     if ( m_windowStyle & wxTE_RICH )
     {

-        msStyle |= ES_AUTOVSCROLL;
-        m_isRich = TRUE;
-        windowClass = _T("RICHEDIT");
+        static bool s_errorGiven = FALSE;   // MT-FIXME
+
+        // only give the error msg once if the DLL can't be loaded
+        if ( !s_errorGiven )
+        {
+            // first try to load the RichEdit DLL (will do nothing if already
+            // done)
+            if ( !wxTheApp->InitRichEdit() )
+            {
+                wxLogError(_("Impossible to create a rich edit control, "
+                             "using simple text control instead."));
+
+                s_errorGiven = TRUE;
+            }
+        }
+
+        if ( s_errorGiven )
+        {
+            m_isRich = FALSE;
+        }
+        else
+        {
+            msStyle |= ES_AUTOVSCROLL;
+            m_isRich = TRUE;
+            windowClass = wxT("RICHEDIT");
+        }

     }
     else
         m_isRich = FALSE;
     }
     else
         m_isRich = FALSE;


@@ -195,7 +223,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                                       wxGetInstance(),
                                       NULL);
 
                                       wxGetInstance(),
                                       NULL);
 

-    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create text ctrl") );
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create text ctrl") );

 
 #if wxUSE_CTL3D
     if ( want3D )
 
 #if wxUSE_CTL3D
     if ( want3D )


@@ -254,7 +282,7 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 
   GetClassName(hWnd, buf, WXSIZEOF(buf));
 
 
   GetClassName(hWnd, buf, WXSIZEOF(buf));
 

-  if ( wxStricmp(buf, _T("EDIT")) == 0 )
+  if ( wxStricmp(buf, wxT("EDIT")) == 0 )

     m_isRich = FALSE;
   else
     m_isRich = TRUE;
     m_isRich = FALSE;
   else
     m_isRich = TRUE;


@@ -290,9 +318,12 @@ void wxTextCtrl::SetValue(const wxString& value)
 {
     wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
 
 {
     wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
 

-    SetWindowText(GetHwnd(), valueDos);
+    if ( valueDos != GetValue() )
+    {
+        SetWindowText(GetHwnd(), valueDos);

 
 

-    AdjustSpaceLimit();
+        AdjustSpaceLimit();
+    }

 }
 
 void wxTextCtrl::WriteText(const wxString& value)
 }
 
 void wxTextCtrl::WriteText(const wxString& value)


@@ -312,7 +343,7 @@ void wxTextCtrl::AppendText(const wxString& text)
 
 void wxTextCtrl::Clear()
 {
 
 void wxTextCtrl::Clear()
 {

-    SetWindowText(GetHwnd(), _T(""));
+    SetWindowText(GetHwnd(), wxT(""));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -734,30 +765,6 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
     }
 }
 
     }
 }
 

-WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam,
-                                WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
-    {
-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
-    }
-#endif
-
-    HDC hdc = (HDC)pDC;
-    SetBkMode(hdc, GetParent()->GetTransparentBackground() ? TRANSPARENT
-                                                           : OPAQUE);
-
-    ::SetBkColor(hdc, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-    ::SetTextColor(hdc, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
-

 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     switch ( event.KeyCode() )
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     switch ( event.KeyCode() )


@@ -877,7 +884,7 @@ bool wxTextCtrl::AcceptsFocus() const
     return IsEditable() && wxControl::AcceptsFocus();
 }
 
     return IsEditable() && wxControl::AcceptsFocus();
 }
 

-wxSize wxTextCtrl::DoGetBestSize()
+wxSize wxTextCtrl::DoGetBestSize() const

 {
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
 {
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());