Merge branch 'fix-caret-default'

Fix using default-constructed wxCaret.

See https://github.com/wxWidgets/wxWidgets/pull/2007
This commit is contained in:
Vadim Zeitlin
2020-10-01 02:29:43 +02:00
3 changed files with 21 additions and 4 deletions

View File

@@ -136,10 +136,22 @@ TEST_CASE_METHOD(WindowTestCase, "Window::Mouse", "[window]")
CHECK(m_window->GetCursor().IsOk());
#if wxUSE_CARET
//A plain window doesn't have a caret
CHECK(!m_window->GetCaret());
wxCaret* caret = new wxCaret(m_window, 16, 16);
wxCaret* caret;
// Try creating the caret in two different, but normally equivalent, ways.
SECTION("Caret 1-step")
{
caret = new wxCaret(m_window, 16, 16);
}
SECTION("Caret 2-step")
{
caret = new wxCaret();
caret->Create(m_window, 16, 16);
}
m_window->SetCaret(caret);
CHECK(m_window->GetCaret()->IsOk());