Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't return the next line text from GetLineText() for empty lines (patch 1697208) [backport from HEAD]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-09 21:19:59 +00:00
parent a46324a7fb
commit d5d363321c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -111,6 +111,7 @@ wxGTK:
- Fix infinite loop when adding a wxStaticText control to a toolbar - Fix infinite loop when adding a wxStaticText control to a toolbar
- Fix wxNO_BORDER style for wxRadioBox (David Hart) - Fix wxNO_BORDER style for wxRadioBox (David Hart)
- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
2.8.3 2.8.3

6
src/gtk/textctrl.cpp
View File

@@ -1119,8 +1119,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
{ {
GtkTextIter line; GtkTextIter line;
gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
GtkTextIter end = line; 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)); wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
result = wxGTK_CONV_BACK(text); result = wxGTK_CONV_BACK(text);
} }