Correctly determine best wxPropertyGrid width.

[wxWidgets.git] / src / common / stattextcmn.cpp

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index 8dce7bed74a4e317d3544df63ead6231c04fd781..e9a22fd8f505823c9088aabdd99fed18451d26b9 100644 (file)
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -24,6 +24,7 @@
     #pragma hdrstop
 #endif
 
+#include "wx/textwrapper.h"
 #include "wx/private/stattext.h"
 
 #ifndef WX_PRECOMP
@@ -68,7 +69,7 @@ void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
             lineStart = p;
         }
 
-        if ( p == text.end() || *p == _T('\n') )
+        if ( p == text.end() || *p == wxT('\n') )
         {
             DoOutputLine(line);
 
@@ -77,7 +78,7 @@ void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
         }
         else // not EOL
         {
-            if ( *p == _T(' ') )
+            if ( *p == wxT(' ') )
                 lastSpace = p;
 
             line += *p;
@@ -126,7 +127,7 @@ protected:
 
     virtual void OnNewLine()
     {
-        m_text += _T('\n');
+        m_text += wxT('\n');
     }
 
 private:
@@ -324,9 +325,18 @@ wxString wxStaticTextBase::Ellipsize(const wxString& label) const
     dc.SetFont(GetFont());
 
     wxEllipsizeMode mode;
-    if (HasFlag(wxST_ELLIPSIZE_START)) mode = wxELLIPSIZE_START;
-    else if (HasFlag(wxST_ELLIPSIZE_MIDDLE)) mode = wxELLIPSIZE_MIDDLE;
-    else if (HasFlag(wxST_ELLIPSIZE_END)) mode = wxELLIPSIZE_END;
+    if ( HasFlag(wxST_ELLIPSIZE_START) )
+        mode = wxELLIPSIZE_START;
+    else if ( HasFlag(wxST_ELLIPSIZE_MIDDLE) )
+        mode = wxELLIPSIZE_MIDDLE;
+    else if ( HasFlag(wxST_ELLIPSIZE_END) )
+        mode = wxELLIPSIZE_END;
+    else
+    {
+        wxFAIL_MSG( "should only be called if have one of wxST_ELLIPSIZE_XXX" );
+
+        return label;
+    }
 
     return wxControl::Ellipsize(label, dc, mode, sz.GetWidth());
 }