Fixed multiline static texts

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 4c8b9414a478fe4b8818e681550fb5aa101ec922..1c0facdbf70d86610846d12989813d7cef848fd9 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -186,7 +186,7 @@ wxSize wxStaticText::DoGetBestSize() const
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {
-        if ( *pc == wxT('\n') || *pc == wxT('\0') )
+        if ( *pc == wxT('\n') || *pc == wxT('\r') || *pc == wxT('\0') )
         {
             if ( !curLine )
             {
@@ -212,7 +212,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 
-            if ( *pc == wxT('\n') ) {
+            if ( *pc == wxT('\n') || *pc == wxT('\r')) {
                curLine.Empty();
             }
             else {

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 4c8b9414a478fe4b8818e681550fb5aa101ec922..1c0facdbf70d86610846d12989813d7cef848fd9 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -186,7 +186,7 @@ wxSize wxStaticText::DoGetBestSize() const
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {
-        if ( *pc == wxT('\n') || *pc == wxT('\0') )
+        if ( *pc == wxT('\n') || *pc == wxT('\r') || *pc == wxT('\0') )
         {
             if ( !curLine )
             {
@@ -212,7 +212,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 
-            if ( *pc == wxT('\n') ) {
+            if ( *pc == wxT('\n') || *pc == wxT('\r')) {
                curLine.Empty();
             }
             else {