don't return the next line text from GetLineText() for empty lines (patch 1697208)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7dd1ae1114
commit
5440a04fa8
@ -153,6 +153,7 @@ wxGTK:
|
||||
|
||||
- Fix infinite loop when adding a wxStaticText control to a toolbar
|
||||
- Fix wxNO_BORDER style for wxRadioBox (David Hart)
|
||||
- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
|
||||
|
||||
|
||||
2.8.3
|
||||
|
@ -1139,8 +1139,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
|
||||
{
|
||||
GtkTextIter line;
|
||||
gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
|
||||
|
||||
GtkTextIter end = line;
|
||||
gtk_text_iter_forward_to_line_end(&end);
|
||||
// avoid skipping to the next line end if this one is empty
|
||||
if ( !gtk_text_iter_ends_line(&line) )
|
||||
gtk_text_iter_forward_to_line_end(&end);
|
||||
|
||||
wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
|
||||
result = wxGTK_CONV_BACK(text);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user