From 5f635db3bf330c05a3942943b4b619dff9be3db3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 6 Sep 2019 14:33:00 +0200
Subject: [PATCH 1/7] Minor cleanup of a dialog in the dialogs sample

Use wxSizerFlags()-based API for clarity high DPI-friendliness, i.e.
don't hard code 5px as border/margin sizes.

No real changes.
---
 samples/dialogs/dialogs.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 9f7dc652f7..1f9f8b37c0 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -2588,7 +2588,8 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
 
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
 
-    wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 5, 5 );
+    const int border = wxSizerFlags::GetDefaultBorder();
+    wxFlexGridSizer *grid_sizer = new wxFlexGridSizer(2, wxSize(border, border));
 
 #if wxUSE_LISTBOX
     wxListBox *listbox = new wxListBox( this, ID_LISTBOX );
@@ -2599,22 +2600,29 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
     grid_sizer->Add( listbox );
 #endif // wxUSE_LISTBOX
 
-    grid_sizer->Add( new wxCheckBox( this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox" ), 0, wxALIGN_CENTRE_VERTICAL );
+    grid_sizer->Add(new wxCheckBox(this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox"),
+                    wxSizerFlags().CentreVertical());
 
-    grid_sizer->Add( new wxTextCtrl( this, -1, "", wxDefaultPosition, wxSize(80,-1), 0 ), 0, wxALIGN_CENTRE_VERTICAL );
-    grid_sizer->Add( new wxStaticText( this, -1, "wxTextCtrl without wxTE_PROCESS_ENTER" ), 0, wxALIGN_CENTRE_VERTICAL );
+    grid_sizer->Add(new wxTextCtrl(this, wxID_ANY, ""),
+                    wxSizerFlags().CentreVertical());
+    grid_sizer->Add(new wxStaticText(this, wxID_ANY, "wxTextCtrl without wxTE_PROCESS_ENTER"),
+                    wxSizerFlags().CentreVertical());
 
-    grid_sizer->Add( new wxTextCtrl( this, -1, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER ), 0, wxALIGN_CENTRE_VERTICAL );
-    grid_sizer->Add( new wxStaticText( this, -1, "wxTextCtrl with wxTE_PROCESS_ENTER" ), 0, wxALIGN_CENTRE_VERTICAL );
+    grid_sizer->Add(new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER),
+                    wxSizerFlags().CentreVertical());
+    grid_sizer->Add(new wxStaticText(this, wxID_ANY, "wxTextCtrl with wxTE_PROCESS_ENTER"),
+                    wxSizerFlags().CentreVertical());
 
-    grid_sizer->Add( new wxCheckBox(this, ID_DISABLE_OK, "Disable \"OK\""), 0, wxALIGN_CENTRE_VERTICAL );
-    grid_sizer->Add( new wxCheckBox(this, ID_DISABLE_CANCEL, "Disable \"Cancel\""), 0, wxALIGN_CENTRE_VERTICAL );
+    grid_sizer->Add(new wxCheckBox(this, ID_DISABLE_OK, "Disable \"OK\""),
+                    wxSizerFlags().CentreVertical());
+    grid_sizer->Add(new wxCheckBox(this, ID_DISABLE_CANCEL, "Disable \"Cancel\""),
+                    wxSizerFlags().CentreVertical());
 
-    main_sizer->Add( grid_sizer, 0, wxALL, 10 );
+    main_sizer->Add(grid_sizer, wxSizerFlags().DoubleBorder());
 
     wxSizer *button_sizer = CreateSeparatedButtonSizer( wxOK|wxCANCEL );
     if ( button_sizer )
-        main_sizer->Add( button_sizer, 0, wxALL|wxGROW, 5 );
+        main_sizer->Add(button_sizer, wxSizerFlags().Expand().Border());
 
     SetSizerAndFit( main_sizer );
 }

From ba2ea837deb337cc12f11c6f64718c053d5e5628 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 6 Sep 2019 17:44:56 +0200
Subject: [PATCH 2/7] Actually make wxTE_PROCESS_ENTER example in dialogs
 sample work

This didn't work any more since the changes done in the branch merged by
fb2c17c193fdc96b4b368e37b0c9e4c245212589 as using wxTE_PROCESS_ENTER
without actually handling the resulting event doesn't prevent Enter from
activating the default button any longer.
---
 samples/dialogs/dialogs.cpp | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 1f9f8b37c0..e511f8db65 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -2581,6 +2581,34 @@ wxBEGIN_EVENT_TABLE(TestDefaultActionDialog, wxDialog)
     EVT_TEXT_ENTER(wxID_ANY,                 TestDefaultActionDialog::OnTextEnter)
 wxEND_EVENT_TABLE()
 
+// TODO-C++11: We can't declare this class inside TestDefaultActionDialog
+//             itself when using C++98, so we have to do it here instead.
+namespace
+{
+
+// We have to define a new class in order to actually handle pressing
+// Enter, if we didn't do it, pressing it would still close the dialog.
+class EnterHandlingTextCtrl : public wxTextCtrl
+{
+public:
+    EnterHandlingTextCtrl(wxWindow* parent, int id, const wxString& value)
+        : wxTextCtrl(parent, id, value,
+                     wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER)
+    {
+        Bind(wxEVT_TEXT_ENTER, &EnterHandlingTextCtrl::OnEnter, this);
+
+        SetInitialSize(GetSizeFromTextSize(GetTextExtent(value).x));
+    }
+
+private:
+    void OnEnter(wxCommandEvent& WXUNUSED(event))
+    {
+        wxLogMessage("Enter pressed");
+    }
+};
+
+} // anonymous namespace
+
 TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
   wxDialog( parent, -1, "Test default action" )
 {
@@ -2603,12 +2631,12 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
     grid_sizer->Add(new wxCheckBox(this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox"),
                     wxSizerFlags().CentreVertical());
 
-    grid_sizer->Add(new wxTextCtrl(this, wxID_ANY, ""),
-                    wxSizerFlags().CentreVertical());
+    grid_sizer->Add(new wxTextCtrl(this, wxID_ANY, "Enter here closes the dialog"),
+                    wxSizerFlags().Expand().CentreVertical());
     grid_sizer->Add(new wxStaticText(this, wxID_ANY, "wxTextCtrl without wxTE_PROCESS_ENTER"),
                     wxSizerFlags().CentreVertical());
 
-    grid_sizer->Add(new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER),
+    grid_sizer->Add(new EnterHandlingTextCtrl(this, wxID_ANY, "Enter here is handled by the application"),
                     wxSizerFlags().CentreVertical());
     grid_sizer->Add(new wxStaticText(this, wxID_ANY, "wxTextCtrl with wxTE_PROCESS_ENTER"),
                     wxSizerFlags().CentreVertical());

From e85b5e5261cd852d4f70489b3393de72090565e4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 8 Sep 2019 18:47:13 +0200
Subject: [PATCH 3/7] Replace a single function with a class in Enter
 processing tests

No real changes yet, this is a pure refactoring before the upcoming
changes.
---
 tests/controls/comboboxtest.cpp  |  7 ++++---
 tests/controls/textctrltest.cpp  | 11 ++++++++---
 tests/controls/textentrytest.cpp | 18 +++++++++++-------
 tests/controls/textentrytest.h   | 26 +++++++++++++++++++++-----
 4 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp
index dd78119ead..5f344060c1 100644
--- a/tests/controls/comboboxtest.cpp
+++ b/tests/controls/comboboxtest.cpp
@@ -233,9 +233,10 @@ void ComboBoxTestCase::IsEmpty()
 
 TEST_CASE("wxComboBox::ProcessEnter", "[wxComboBox][enter]")
 {
-    struct ComboBoxCreator
+    class ComboBoxCreator : public TextLikeControlCreator
     {
-        static wxControl* Do(wxWindow* parent, int style)
+    public:
+        virtual wxControl* Create(wxWindow* parent, int style) const wxOVERRIDE
         {
             const wxString choices[] = { "foo", "bar", "baz" };
 
@@ -246,7 +247,7 @@ TEST_CASE("wxComboBox::ProcessEnter", "[wxComboBox][enter]")
         }
     };
 
-    TestProcessEnter(&ComboBoxCreator::Do);
+    TestProcessEnter(ComboBoxCreator());
 }
 
 #endif //wxUSE_COMBOBOX
diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
index db3c44473f..74726bd63e 100644
--- a/tests/controls/textctrltest.cpp
+++ b/tests/controls/textctrltest.cpp
@@ -1271,9 +1271,14 @@ void TextCtrlTestCase::XYToPositionSingleLine()
 
 TEST_CASE("wxTextCtrl::ProcessEnter", "[wxTextCtrl][enter]")
 {
-    struct TextCtrlCreator
+    class TextCtrlCreator : public TextLikeControlCreator
     {
-        static wxControl* Do(wxWindow* parent, int style)
+    public:
+        explicit TextCtrlCreator()
+        {
+        }
+
+        virtual wxControl* Create(wxWindow* parent, int style) const wxOVERRIDE
         {
             return new wxTextCtrl(parent, wxID_ANY, wxString(),
                                   wxDefaultPosition, wxDefaultSize,
@@ -1281,7 +1286,7 @@ TEST_CASE("wxTextCtrl::ProcessEnter", "[wxTextCtrl][enter]")
         }
     };
 
-    TestProcessEnter(&TextCtrlCreator::Do);
+    TestProcessEnter(TextCtrlCreator());
 }
 
 #endif //wxUSE_TEXTCTRL
diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index ff1c9f36f6..7e40d42bec 100644
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -384,13 +384,17 @@ enum ProcessEnter
 class TestDialog : public wxDialog
 {
 public:
-    explicit TestDialog(TextLikeControlCreator controlCreator,
+    explicit TestDialog(const TextLikeControlCreator& controlCreator,
                         ProcessEnter processEnter)
         : wxDialog(wxTheApp->GetTopWindow(), wxID_ANY, "Test dialog"),
-          m_control((*controlCreator)(this,
-                                      processEnter == ProcessEnter_No
-                                        ? 0
-                                        : wxTE_PROCESS_ENTER)),
+          m_control
+          (
+              controlCreator.Create
+              (
+               this,
+               processEnter == ProcessEnter_No ? 0 : wxTE_PROCESS_ENTER
+              )
+          ),
           m_processEnter(processEnter),
           m_gotEnter(false)
     {
@@ -455,7 +459,7 @@ private:
 
 } // anonymous namespace
 
-void TestProcessEnter(TextLikeControlCreator controlCreator)
+void TestProcessEnter(const TextLikeControlCreator& controlCreator)
 {
     if ( !EnableUITests() )
     {
@@ -487,7 +491,7 @@ void TestProcessEnter(TextLikeControlCreator controlCreator)
 
 #else // !wxUSE_UIACTIONSIMULATOR
 
-void TestProcessEnter(TextLikeControlCreator WXUNUSED(controlCreator))
+void TestProcessEnter(const TextLikeControlCreator& WXUNUSED(controlCreator))
 {
     WARN("Skipping wxTE_PROCESS_ENTER tests: wxUIActionSimulator not available");
 }
diff --git a/tests/controls/textentrytest.h b/tests/controls/textentrytest.h
index 33879e6346..5545d00aed 100644
--- a/tests/controls/textentrytest.h
+++ b/tests/controls/textentrytest.h
@@ -75,11 +75,27 @@ private:
     wxDECLARE_NO_COPY_CLASS(TextEntryTestCase);
 };
 
-// Function to call to test that wxTE_PROCESS_ENTER is handled correctly for
-// the controls of the type created by the given creator function when they're
-// placed in a dialog with a default button.
-typedef wxControl* (*TextLikeControlCreator)(wxWindow* parent, int style);
+// Helper used for creating the control of the specific type (currently either
+// wxTextCtrl or wxComboBox) with the given flag.
+class TextLikeControlCreator
+{
+public:
+    TextLikeControlCreator() {}
 
-void TestProcessEnter(TextLikeControlCreator controlCreator);
+    // Create the control of the right type using the given parent and style.
+    virtual wxControl* Create(wxWindow* parent, int style) const = 0;
+
+    // Give it a virtual dtor to avoid warnings even though this class is not
+    // supposed to be used polymorphically.
+    virtual ~TextLikeControlCreator() {}
+
+private:
+    wxDECLARE_NO_COPY_CLASS(TextLikeControlCreator);
+};
+
+// Use the given control creator to check that various combinations of
+// specifying and not specifying wxTE_PROCESS_ENTER and handling or not
+// handling the resulting event work as expected.
+void TestProcessEnter(const TextLikeControlCreator& controlCreator);
 
 #endif // _WX_TESTS_CONTROLS_TEXTENTRYTEST_H_

From 4c075c2128c9de7a78399d1587ff79778c04f076 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 8 Sep 2019 18:48:30 +0200
Subject: [PATCH 4/7] Replace Bind() call with an event table in Enter handling
 tests

For once, using the event table macros is preferable because this
bypasses the (generally helpful, but not here) test done by Bind()
verifying that wxEVT_TEXT_ENTER handler is bound to a window with
wxTE_PROCESS_ENTER style.

Doing it like this will allow to check that controls without this style
really do not receive the corresponding event.
---
 tests/controls/textentrytest.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index 7e40d42bec..4d1178a555 100644
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -398,11 +398,6 @@ public:
           m_processEnter(processEnter),
           m_gotEnter(false)
     {
-        // We can't always bind this handler because wx will helpfully
-        // complain if we bind it without using wxTE_PROCESS_ENTER.
-        if ( processEnter != ProcessEnter_No )
-            m_control->Bind(wxEVT_TEXT_ENTER, &TestDialog::OnTextEnter, this);
-
         wxSizer* const sizer = new wxBoxSizer(wxVERTICAL);
         sizer->Add(m_control, wxSizerFlags().Expand());
         sizer->Add(CreateStdDialogButtonSizer(wxOK));
@@ -455,8 +450,18 @@ private:
     const ProcessEnter m_processEnter;
     wxTimer m_timer;
     bool m_gotEnter;
+
+    wxDECLARE_EVENT_TABLE();
 };
 
+// Note that we must use event table macros here instead of Bind() because
+// binding wxEVT_TEXT_ENTER handler for a control without wxTE_PROCESS_ENTER
+// style would fail with an assertion failure, due to wx helpfully complaining
+// about it.
+wxBEGIN_EVENT_TABLE(TestDialog, wxDialog)
+    EVT_TEXT_ENTER(wxID_ANY, TestDialog::OnTextEnter)
+wxEND_EVENT_TABLE()
+
 } // anonymous namespace
 
 void TestProcessEnter(const TextLikeControlCreator& controlCreator)

From 84f29ce47298cbe32fc224ff57160eb0ca11cf1b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 8 Sep 2019 18:50:02 +0200
Subject: [PATCH 5/7] Don't send EVT_TEXT_ENTER to controls without
 wxTE_PROCESS_ENTER

wxMSW always sent this event to multiline text controls, even when they
didn't have wxTE_PROCESS_ENTER style, contrary to what was documented.

Avoid sending this event unless wxTE_PROCESS_ENTER is used and add unit
tests checking that multiline text controls don't get it without this
style (but still do get it with it).
---
 docs/changes.txt                 |  5 +++
 src/msw/textctrl.cpp             | 10 ++++--
 tests/controls/textctrltest.cpp  | 13 ++++++--
 tests/controls/textentrytest.cpp | 56 ++++++++++++++++++++++++++++++++
 tests/controls/textentrytest.h   |  5 +++
 5 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index f8e072900a..b9ae88a031 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -73,6 +73,11 @@ Changes in behaviour not resulting in compilation errors
 - wxDC::DrawCheckMark() draws the same shape under all platforms now, use the
   new wxRendererNative::DrawCheckMark() to draw MSW-specific themed check mark.
 
+- wxTE_PROCESS_ENTER must be used to receive wxEVT_TEXT_ENTER events from even
+  multiline wxTextCtrl, conforming to the documentation, but contrary to the
+  previous behaviour in wxMSW, when these events were always generated in this
+  case. Please add wxTE_PROCESS_ENTER style if you relied on the old behaviour.
+
 
 Changes in behaviour which may result in build errors
 -----------------------------------------------------
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 82c346a85b..6ee2ff9c0b 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2075,14 +2075,18 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
+            // Single line controls only get this key code if they have
+            // wxTE_PROCESS_ENTER style, but multiline ones always get it
+            // because they need it for themselves. However we shouldn't
+            // generate wxEVT_TEXT_ENTER for the controls without this style,
+            // so test for it explicitly.
+            if ( HasFlag(wxTE_PROCESS_ENTER) )
             {
                 wxCommandEvent evt(wxEVT_TEXT_ENTER, m_windowId);
                 InitCommandEvent(evt);
                 evt.SetString(GetValue());
                 if ( HandleWindowEvent(evt) )
-                    if ( !HasFlag(wxTE_MULTILINE) )
-                        return;
-                    //else: multiline controls need Enter for themselves
+                    return;
             }
             break;
 
diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
index 74726bd63e..2d25ebd674 100644
--- a/tests/controls/textctrltest.cpp
+++ b/tests/controls/textctrltest.cpp
@@ -1274,7 +1274,8 @@ TEST_CASE("wxTextCtrl::ProcessEnter", "[wxTextCtrl][enter]")
     class TextCtrlCreator : public TextLikeControlCreator
     {
     public:
-        explicit TextCtrlCreator()
+        explicit TextCtrlCreator(int styleToAdd = 0)
+            : m_styleToAdd(styleToAdd)
         {
         }
 
@@ -1282,8 +1283,16 @@ TEST_CASE("wxTextCtrl::ProcessEnter", "[wxTextCtrl][enter]")
         {
             return new wxTextCtrl(parent, wxID_ANY, wxString(),
                                   wxDefaultPosition, wxDefaultSize,
-                                  style);
+                                  style | m_styleToAdd);
         }
+
+        virtual TextLikeControlCreator* CloneAsMultiLine() const wxOVERRIDE
+        {
+            return new TextCtrlCreator(wxTE_MULTILINE);
+        }
+
+    private:
+        int m_styleToAdd;
     };
 
     TestProcessEnter(TextCtrlCreator());
diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index 4d1178a555..ab65a7c622 100644
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -21,6 +21,8 @@
 
 #include "textentrytest.h"
 #include "testableframe.h"
+
+#include "wx/scopedptr.h"
 #include "wx/uiaction.h"
 
 void TextEntryTestCase::SetValue()
@@ -434,6 +436,23 @@ private:
         }
     }
 
+    void OnText(wxCommandEvent& WXUNUSED(e))
+    {
+        // This should only happen for the multiline text controls.
+        switch ( m_processEnter )
+        {
+            case ProcessEnter_No:
+            case ProcessEnter_ButSkip:
+                // We consider that the text succeeded.
+                EndModal(wxID_OK);
+                break;
+
+            case ProcessEnter_WithoutSkipping:
+                FAIL("Shouldn't be getting wxEVT_TEXT if handled");
+                break;
+        }
+    }
+
     void OnTimeOut(wxTimerEvent&)
     {
         EndModal(wxID_CANCEL);
@@ -459,6 +478,7 @@ private:
 // style would fail with an assertion failure, due to wx helpfully complaining
 // about it.
 wxBEGIN_EVENT_TABLE(TestDialog, wxDialog)
+    EVT_TEXT(wxID_ANY, TestDialog::OnText)
     EVT_TEXT_ENTER(wxID_ANY, TestDialog::OnTextEnter)
 wxEND_EVENT_TABLE()
 
@@ -492,6 +512,42 @@ void TestProcessEnter(const TextLikeControlCreator& controlCreator)
         REQUIRE( dlgProcessEnter.ShowModal() == wxID_APPLY );
         CHECK( dlgProcessEnter.GotEnter() );
     }
+
+    SECTION("Without wxTE_PROCESS_ENTER but with wxTE_MULTILINE")
+    {
+        wxScopedPtr<TextLikeControlCreator>
+            multiLineCreator(controlCreator.CloneAsMultiLine());
+        if ( !multiLineCreator )
+            return;
+
+        TestDialog dlg(*multiLineCreator, ProcessEnter_No);
+        REQUIRE( dlg.ShowModal() == wxID_OK );
+        CHECK( !dlg.GotEnter() );
+    }
+
+    SECTION("With wxTE_PROCESS_ENTER and wxTE_MULTILINE but skipping")
+    {
+        wxScopedPtr<TextLikeControlCreator>
+            multiLineCreator(controlCreator.CloneAsMultiLine());
+        if ( !multiLineCreator )
+            return;
+
+        TestDialog dlg(*multiLineCreator, ProcessEnter_ButSkip);
+        REQUIRE( dlg.ShowModal() == wxID_OK );
+        CHECK( dlg.GotEnter() );
+    }
+
+    SECTION("With wxTE_PROCESS_ENTER and wxTE_MULTILINE without skipping")
+    {
+        wxScopedPtr<TextLikeControlCreator>
+            multiLineCreator(controlCreator.CloneAsMultiLine());
+        if ( !multiLineCreator )
+            return;
+
+        TestDialog dlg(*multiLineCreator, ProcessEnter_WithoutSkipping);
+        REQUIRE( dlg.ShowModal() == wxID_APPLY );
+        CHECK( dlg.GotEnter() );
+    }
 }
 
 #else // !wxUSE_UIACTIONSIMULATOR
diff --git a/tests/controls/textentrytest.h b/tests/controls/textentrytest.h
index 5545d00aed..c5b2c31592 100644
--- a/tests/controls/textentrytest.h
+++ b/tests/controls/textentrytest.h
@@ -85,6 +85,11 @@ public:
     // Create the control of the right type using the given parent and style.
     virtual wxControl* Create(wxWindow* parent, int style) const = 0;
 
+    // Return another creator similar to this one, but creating multiline
+    // version of the control. If the returned pointer is non-null, it must be
+    // deleted by the caller.
+    virtual TextLikeControlCreator* CloneAsMultiLine() const { return NULL; }
+
     // Give it a virtual dtor to avoid warnings even though this class is not
     // supposed to be used polymorphically.
     virtual ~TextLikeControlCreator() {}

From 9bab9d8da811583b407da8ac066524c888739362 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 8 Sep 2019 22:05:58 +0200
Subject: [PATCH 6/7] Don't activate default button on Enter in multiline
 wxTextCtrl

Restore behaviour until c43e0fa123a47cf4f5d79e88336544d6fc5de399 and let
Enter presses in multiline text controls perform their default function
in the control instead of closing the dialog.

Make the unit test more discerning to check for this.
---
 src/msw/textctrl.cpp             |  2 +-
 tests/controls/textentrytest.cpp | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 6ee2ff9c0b..cc64246844 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2216,7 +2216,7 @@ wxTextCtrl::MSWHandleMessage(WXLRESULT *rc,
             // Fix these problems by explicitly performing the default function of this
             // key (which would be done by MSWProcessMessage() if we didn't have
             // wxTE_PROCESS_ENTER) and preventing the default WndProc from getting it.
-            if ( !processed && wParam == VK_RETURN )
+            if ( !processed && wParam == VK_RETURN && IsSingleLine() )
             {
                 if ( ClickDefaultButtonIfPossible() )
                     processed = true;
diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index ab65a7c622..44bc437d89 100644
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -443,8 +443,10 @@ private:
         {
             case ProcessEnter_No:
             case ProcessEnter_ButSkip:
-                // We consider that the text succeeded.
-                EndModal(wxID_OK);
+                // We consider that the text succeeded, but in a different way,
+                // so use a different ID to be able to distinguish between this
+                // scenario and Enter activating the default button.
+                EndModal(wxID_CLOSE);
                 break;
 
             case ProcessEnter_WithoutSkipping:
@@ -521,7 +523,7 @@ void TestProcessEnter(const TextLikeControlCreator& controlCreator)
             return;
 
         TestDialog dlg(*multiLineCreator, ProcessEnter_No);
-        REQUIRE( dlg.ShowModal() == wxID_OK );
+        REQUIRE( dlg.ShowModal() == wxID_CLOSE );
         CHECK( !dlg.GotEnter() );
     }
 
@@ -533,7 +535,7 @@ void TestProcessEnter(const TextLikeControlCreator& controlCreator)
             return;
 
         TestDialog dlg(*multiLineCreator, ProcessEnter_ButSkip);
-        REQUIRE( dlg.ShowModal() == wxID_OK );
+        REQUIRE( dlg.ShowModal() == wxID_CLOSE );
         CHECK( dlg.GotEnter() );
     }
 

From fbdc55ee0a73d5c0f05c9525cfb288018abc3a78 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 8 Sep 2019 15:12:45 +0200
Subject: [PATCH 7/7] Test multiline text control in the "Enter" testing
 dialogs

Add another test control to the dialogs sample.
---
 samples/dialogs/dialogs.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index e511f8db65..337fdba27d 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -2641,6 +2641,14 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
     grid_sizer->Add(new wxStaticText(this, wxID_ANY, "wxTextCtrl with wxTE_PROCESS_ENTER"),
                     wxSizerFlags().CentreVertical());
 
+    grid_sizer->Add(new wxTextCtrl(this, wxID_ANY,
+                                   "Enter here adds another line,\n"
+                                   "while Ctrl-Enter closes the dialog",
+                                   wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE),
+                    wxSizerFlags().Expand());
+    grid_sizer->Add(new wxStaticText(this, wxID_ANY, "wxTextCtrl without wxTE_PROCESS_ENTER"),
+                    wxSizerFlags().CentreVertical());
+
     grid_sizer->Add(new wxCheckBox(this, ID_DISABLE_OK, "Disable \"OK\""),
                     wxSizerFlags().CentreVertical());
     grid_sizer->Add(new wxCheckBox(this, ID_DISABLE_CANCEL, "Disable \"Cancel\""),