Replace a single function with a class in Enter processing tests

No real changes yet, this is a pure refactoring before the upcoming
changes.
This commit is contained in:
Vadim Zeitlin
2019-09-08 18:47:13 +02:00
parent ba2ea837de
commit e85b5e5261
4 changed files with 44 additions and 18 deletions

View File

@@ -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");
}