fixing focus, fixes #11911

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 533da4a07717674cb4b41957edd21c58a61a605b..8ffbfce0c1799c2cdf93365d1e8942f6541b10fb 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -147,7 +147,7 @@ public:
         : m_count(count)
     {
         wxASSERT_MSG( m_count == -1 || m_count == -2,
         : m_count(count)
     {
         wxASSERT_MSG( m_count == -1 || m_count == -2,

-                      _T("wrong initial m_updatesCount value") );
+                      wxT("wrong initial m_updatesCount value") );

 
         if (m_count != -2)
             m_count = 0;
 
         if (m_count != -2)
             m_count = 0;


@@ -433,15 +433,15 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_41) )
                 {
                     // yes, class name for version 4.1 really is 5.0
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_41) )
                 {
                     // yes, class name for version 4.1 really is 5.0

-                    windowClass = _T("RICHEDIT50W");
+                    windowClass = wxT("RICHEDIT50W");

                 }
                 else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) )
                 {
                 }
                 else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) )
                 {

-                    windowClass = _T("RichEdit20")
+                    windowClass = wxT("RichEdit20")

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-                                _T("W");
+                                wxT("W");

 #else // ANSI
 #else // ANSI

-                                _T("A");
+                                wxT("A");

 #endif // Unicode/ANSI
                 }
                 else // failed to load msftedit.dll and riched20.dll
 #endif // Unicode/ANSI
                 }
                 else // failed to load msftedit.dll and riched20.dll


@@ -454,7 +454,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
             {
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_1) )
                 {
             {
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_1) )
                 {

-                    windowClass = _T("RICHEDIT");
+                    windowClass = wxT("RICHEDIT");

                 }
                 else // failed to load any richedit control DLL
                 {
                 }
                 else // failed to load any richedit control DLL
                 {


@@ -544,7 +544,20 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
 
         ::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask);
     }
 
         ::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask);
     }

+    else

 #endif // wxUSE_RICHEDIT
 #endif // wxUSE_RICHEDIT

+    if ( HasFlag(wxTE_MULTILINE) && HasFlag(wxTE_READONLY) )
+    {
+        // non-rich read-only multiline controls have grey background by
+        // default under MSW but this is not always appropriate, so forcefully
+        // reset the background colour to normal default
+        //
+        // this is not ideal but, after a long discussion on wx-dev (see
+        // http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/116360/) it
+        // was finally deemed to be the best behaviour by default (and ideally
+        // we'd have a way to change this, see #11521)
+        SetBackgroundColour(GetClassDefaultAttributes().colBg);
+    }

 
 #ifndef __WXWINCE__
     // Without this, if we pass the size in the constructor and then don't change it,
 
 #ifndef __WXWINCE__
     // Without this, if we pass the size in the constructor and then don't change it,


@@ -569,16 +582,16 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 #if wxUSE_RICHEDIT
     wxString classname = wxGetWindowClass(GetHWND());
 
 #if wxUSE_RICHEDIT
     wxString classname = wxGetWindowClass(GetHWND());
 

-    if ( classname.IsSameAs(_T("EDIT"), false /* no case */) )
+    if ( classname.IsSameAs(wxT("EDIT"), false /* no case */) )

     {
         m_verRichEdit = 0;
     }
     else // rich edit?
     {
         wxChar c;
     {
         m_verRichEdit = 0;
     }
     else // rich edit?
     {
         wxChar c;

-        if ( wxSscanf(classname, _T("RichEdit%d0%c"), &m_verRichEdit, &c) != 2 )
+        if ( wxSscanf(classname, wxT("RichEdit%d0%c"), &m_verRichEdit, &c) != 2 )

         {
         {

-            wxLogDebug(_T("Unknown edit control '%s'."), classname.c_str());
+            wxLogDebug(wxT("Unknown edit control '%s'."), classname.c_str());

 
             m_verRichEdit = 0;
         }
 
             m_verRichEdit = 0;
         }


@@ -843,8 +856,8 @@ wxString wxTextCtrl::GetRange(long from, long to) const
                     // style - convert it to something reasonable
                     for ( ; *p; p++ )
                     {
                     // style - convert it to something reasonable
                     for ( ; *p; p++ )
                     {

-                        if ( *p == _T('\r') )
-                            *p = _T('\n');
+                        if ( *p == wxT('\r') )
+                            *p = wxT('\n');

                     }
                 }
             }
                     }
                 }
             }


@@ -1018,11 +1031,11 @@ wxTextCtrl::StreamIn(const wxString& value,
     // It's okay for EN_UPDATE to not be sent if the selection is empty and
     // the text is empty, otherwise warn the programmer about it.
     wxASSERT_MSG( ucf.GotUpdate() || ( !HasSelection() && value.empty() ),
     // It's okay for EN_UPDATE to not be sent if the selection is empty and
     // the text is empty, otherwise warn the programmer about it.
     wxASSERT_MSG( ucf.GotUpdate() || ( !HasSelection() && value.empty() ),

-                  _T("EM_STREAMIN didn't send EN_UPDATE?") );
+                  wxT("EM_STREAMIN didn't send EN_UPDATE?") );

 
     if ( eds.dwError )
     {
 
     if ( eds.dwError )
     {

-        wxLogLastError(_T("EM_STREAMIN"));
+        wxLogLastError(wxT("EM_STREAMIN"));

     }
 
 #if !wxUSE_WCHAR_T
     }
 
 #if !wxUSE_WCHAR_T


@@ -1068,7 +1081,7 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
 
     if ( eds.dwError )
     {
 
     if ( eds.dwError )
     {

-        wxLogLastError(_T("EM_STREAMOUT"));
+        wxLogLastError(wxT("EM_STREAMOUT"));

     }
     else // streamed out ok
     {
     }
     else // streamed out ok
     {


@@ -1621,24 +1634,24 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
         {
             // remove the '\r' returned by the rich edit control, the user code
             // should never see it
         {
             // remove the '\r' returned by the rich edit control, the user code
             // should never see it

-            if ( buf[len - 2] == _T('\r') && buf[len - 1] == _T('\n') )
+            if ( buf[len - 2] == wxT('\r') && buf[len - 1] == wxT('\n') )

             {
                 // richedit 1.0 uses "\r\n" as line terminator, so remove "\r"
                 // here and "\n" below
             {
                 // richedit 1.0 uses "\r\n" as line terminator, so remove "\r"
                 // here and "\n" below

-                buf[len - 2] = _T('\n');
+                buf[len - 2] = wxT('\n');

                 len--;
             }
                 len--;
             }

-            else if ( buf[len - 1] == _T('\r') )
+            else if ( buf[len - 1] == wxT('\r') )

             {
                 // richedit 2.0+ uses only "\r", replace it with "\n"
             {
                 // richedit 2.0+ uses only "\r", replace it with "\n"

-                buf[len - 1] = _T('\n');
+                buf[len - 1] = wxT('\n');

             }
         }
 #endif // wxUSE_RICHEDIT
 
         // remove the '\n' at the end, if any (this is how this function is
         // supposed to work according to the docs)
             }
         }
 #endif // wxUSE_RICHEDIT
 
         // remove the '\n' at the end, if any (this is how this function is
         // supposed to work according to the docs)

-        if ( buf[len - 1] == _T('\n') )
+        if ( buf[len - 1] == wxT('\n') )

         {
             len--;
         }
         {
             len--;
         }


@@ -1759,7 +1772,7 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
             switch ( ctrl + shift )
             {
                 default:
             switch ( ctrl + shift )
             {
                 default:

-                    wxFAIL_MSG( _T("how many modifiers have we got?") );
+                    wxFAIL_MSG( wxT("how many modifiers have we got?") );

                     // fall through
 
                 case 0:
                     // fall through
 
                 case 0:


@@ -1928,6 +1941,21 @@ WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                 }
             }
             break;
                 }
             }
             break;

+
+#if wxUSE_MENUS
+        case WM_SETCURSOR:
+            // rich text controls seem to have a bug and don't change the
+            // cursor to the standard arrow one from the I-beam cursor usually
+            // used by them even when a popup menu is shown (this works fine
+            // for plain EDIT controls though), so explicitly work around this
+            if ( IsRich() )
+            {
+                extern wxMenu *wxCurrentPopupMenu;
+                if ( wxCurrentPopupMenu &&
+                        wxCurrentPopupMenu->GetInvokingWindow() == this )
+                    ::SetCursor(GetHcursorOf(*wxSTANDARD_CURSOR));
+            }
+#endif // wxUSE_MENUS

     }
 
     return lRc;
     }
 
     return lRc;


@@ -1951,7 +1979,7 @@ bool wxTextCtrl::SendUpdateEvent()
             return false;
 
         default:
             return false;
 
         default:

-            wxFAIL_MSG( _T("unexpected wxTextCtrl::m_updatesCount value") );
+            wxFAIL_MSG( wxT("unexpected wxTextCtrl::m_updatesCount value") );

             // fall through
 
         case -1:
             // fall through
 
         case -1:


@@ -2182,23 +2210,6 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-// ----------------------------------------------------------------------------
-// Default colors for MSW text control
-//
-// Set default background color to the native white instead of
-// the default wxSYS_COLOUR_BTNFACE (is triggered with wxNullColour).
-// ----------------------------------------------------------------------------
-
-wxVisualAttributes wxTextCtrl::GetDefaultAttributes() const
-{
-    wxVisualAttributes attrs;
-    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); //white
-
-    return attrs;
-}
-

 // the rest of the file only deals with the rich edit controls
 #if wxUSE_RICHEDIT
 
 // the rest of the file only deals with the rich edit controls
 #if wxUSE_RICHEDIT
 


@@ -2492,7 +2503,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
                             SCF_SELECTION, (LPARAM)&cf) != 0;
     if ( !ok )
     {
                             SCF_SELECTION, (LPARAM)&cf) != 0;
     if ( !ok )
     {

-        wxLogDebug(_T("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed"));
+        wxLogDebug(wxT("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed"));

     }
 
     // now do the paragraph formatting
     }
 
     // now do the paragraph formatting


@@ -2577,7 +2588,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
                                 0, (LPARAM) &pf) != 0;
         if ( !ok )
         {
                                 0, (LPARAM) &pf) != 0;
         if ( !ok )
         {

-            wxLogDebug(_T("SendMessage(EM_SETPARAFORMAT, 0) failed"));
+            wxLogDebug(wxT("SendMessage(EM_SETPARAFORMAT, 0) failed"));

         }
     }
 
         }
     }
 


@@ -2796,11 +2807,11 @@ bool wxRichEditModule::Load(Version version)
         return true;
     }
 
         return true;
     }
 

-    static const wxChar *dllnames[] =
+    static const wxChar *const dllnames[] =

     {
     {

-        _T("riched32"),
-        _T("riched20"),
-        _T("msftedit"),
+        wxT("riched32"),
+        wxT("riched20"),
+        wxT("msftedit"),

     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(dllnames) == Version_Max,
     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(dllnames) == Version_Max,


@@ -2822,10 +2833,8 @@ bool wxRichEditModule::Load(Version version)
 // load the InkEdit library
 bool wxRichEditModule::LoadInkEdit()
 {
 // load the InkEdit library
 bool wxRichEditModule::LoadInkEdit()
 {

-    static wxDynamicLibrary ms_inkEditLib;
-    static bool             ms_inkEditLibLoadAttemped;

     if (ms_inkEditLibLoadAttemped)
     if (ms_inkEditLibLoadAttemped)

-        ms_inkEditLib.IsLoaded();
+        return ms_inkEditLib.IsLoaded();

 
     ms_inkEditLibLoadAttemped = true;
 
 
     ms_inkEditLibLoadAttemped = true;