X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55094d8b356fe5793984909046cfcee517127b36..eef4e26cd32230afed230ee29fe5e935d39a5e4b:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 4c8b9414a4..1c0facdbf7 100644
--- 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 {