From c24ded647e25ceb9d1cbdcb1c2a1643a292c666f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Sep 2014 17:39:08 +0000 Subject: [PATCH] in wxGTK, wxOSX/Cocoa, plus wxUniv, GetNumberOfLines() always returns the number of logical, not physical, lines. See #12366, maybe they did not test wxUniv at that time. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/controls/textctrltest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp index 9639f26b2d..59d0bff977 100644 --- a/tests/controls/textctrltest.cpp +++ b/tests/controls/textctrltest.cpp @@ -500,8 +500,9 @@ void TextCtrlTestCase::Lines() // This currently doesn't work neither in wxGTK nor wxOSX/Cocoa, see // #12366, where GetNumberOfLines() always returns the number of logical, // not physical, lines. + // Update 5,23, 2014, same situation in wxUniv. m_text->AppendText("\n" + wxString(50, '1') + ' ' + wxString(50, '2')); -#if defined(__WXGTK__) || defined(__WXOSX_COCOA__) +#if defined(__WXGTK__) || defined(__WXOSX_COCOA__) || defined(__WXUNIVERSAL__) CPPUNIT_ASSERT_EQUAL(6, m_text->GetNumberOfLines()); #else CPPUNIT_ASSERT_EQUAL(7, m_text->GetNumberOfLines());