fixed WM_GETDLGCODE processing to include the bits returned by the DefWindowProc...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 07fa37fe8b3082decdbaab1f822a1ee17aa75913..c5e03295f3b52f537e4ab90dbfa8df53babd7f16 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -128,7 +128,6 @@ public:
     // Implementation from now on
     // --------------------------
 
     // Implementation from now on
     // --------------------------
 

-    virtual void SetFocus();

     virtual void SetWindowStyleFlag(long style);
 
     virtual void Command(wxCommandEvent& event);
     virtual void SetWindowStyleFlag(long style);
 
     virtual void Command(wxCommandEvent& event);

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 2e7893955dfeb74a22a37999fdf57f291d466ab6..24af3187f6acecb2ab4f044861cd7f64530cd26a 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1217,6 +1217,8 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 
 long wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

+    long lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
+

     if ( nMsg == WM_GETDLGCODE )
     {
         // we always want the chars and the arrows
     if ( nMsg == WM_GETDLGCODE )
     {
         // we always want the chars and the arrows


@@ -1238,24 +1240,10 @@ long wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         if ( HasFlag(wxTE_PROCESS_TAB) )
             lDlgCode |= DLGC_WANTTAB;
 
         if ( HasFlag(wxTE_PROCESS_TAB) )
             lDlgCode |= DLGC_WANTTAB;
 

-        return lDlgCode;
+        lRc |= lDlgCode;

     }
 
     }
 

-    return wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-void wxTextCtrl::SetFocus()
-{
-    wxTextCtrlBase::SetFocus();
-
-    // to be consistent with the standard Windows behaviour we select all text
-    // in the single line edit controls when the user TABs to them and also, to
-    // be consistent with this behaviour in turn, do it whenever SetFocus() is
-    // called as well
-    if ( !HasFlag(wxTE_MULTILINE) )
-    {
-        SetSelection(-1, -1);
-    }
+    return lRc;

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