blank lines were ignored in multiline cell labels (replaces patch 1476165)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 62cd9e56d764bdba260ba7fb6f6eaf8f8f5cb8a7..41e4a7668b62efdb3df7e457620fa9d9e081efdb 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -130,6 +130,7 @@ All (GUI):
   wxHtmlListBox::OnLinkClicked() to take advantage of it.
 - Added an easier to use wxMenu::AppendSubMenu()
 - wxString <-> wxColour conversions in wxColour class (Francesco Montorsi).
+- Fixed bug with ignoring blank lines in multiline wxGrid cell labels
 
 wxMSW:
 

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 385a1cf3107eb7e1a8ec46ab0982c4b17ee1a0f8..81140534de100c8c084fb3f4af86ddbbca9c71d3 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -7606,6 +7606,12 @@ void wxGrid::DrawTextRectangle(wxDC& dc,
     {
         const wxString& line = lines[l];
 
+        if ( line.empty() )
+        {
+            *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+            continue;
+        }
+
         long lineWidth,
              lineHeight;
         dc.GetTextExtent(line, &lineWidth, &lineHeight);