fixing include type

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

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index b4b6acee004d9a96183e4a34931bf9f8c1555ac3..e9a22fd8f505823c9088aabdd99fed18451d26b9 100644 (file)
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -24,6 +24,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/textwrapper.h"

 #include "wx/private/stattext.h"
 
 #ifndef WX_PRECOMP
 #include "wx/private/stattext.h"
 
 #ifndef WX_PRECOMP


@@ -37,8 +38,6 @@
     #include "wx/containr.h"
 #endif
 
     #include "wx/containr.h"
 #endif
 

-#if wxUSE_STATTEXT
-

 const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
 {
     // the entities handled by SetLabel() when wxST_MARKUP is used and their referenced string
 const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
 {
     // the entities handled by SetLabel() when wxST_MARKUP is used and their referenced string


@@ -47,6 +46,7 @@ const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
     { wxT("&"),     wxT("<"),    wxT(">"),    wxT("'"),      wxT("\"")     }
 };
 
     { wxT("&"),     wxT("<"),    wxT(">"),    wxT("'"),      wxT("\"")     }
 };
 

+#if wxUSE_STATTEXT

 
 // ----------------------------------------------------------------------------
 // wxTextWrapper
 
 // ----------------------------------------------------------------------------
 // wxTextWrapper


@@ -69,7 +69,7 @@ void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
             lineStart = p;
         }
 
             lineStart = p;
         }
 

-        if ( p == text.end() || *p == _T('\n') )
+        if ( p == text.end() || *p == wxT('\n') )

         {
             DoOutputLine(line);
 
         {
             DoOutputLine(line);
 


@@ -78,7 +78,7 @@ void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
         }
         else // not EOL
         {
         }
         else // not EOL
         {

-            if ( *p == _T(' ') )
+            if ( *p == wxT(' ') )

                 lastSpace = p;
 
             line += *p;
                 lastSpace = p;
 
             line += *p;


@@ -127,7 +127,7 @@ protected:
 
     virtual void OnNewLine()
     {
 
     virtual void OnNewLine()
     {

-        m_text += _T('\n');
+        m_text += wxT('\n');

     }
 
 private:
     }
 
 private:


@@ -271,7 +271,6 @@ wxString wxStaticTextBase::EscapeMarkup(const wxString& text)
 }
 
 
 }
 
 

-

 // ----------------------------------------------------------------------------
 // wxStaticTextBase - generic implementation for wxST_ELLIPSIZE_* support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticTextBase - generic implementation for wxST_ELLIPSIZE_* support
 // ----------------------------------------------------------------------------


@@ -286,7 +285,7 @@ void wxStaticTextBase::UpdateLabel()
     // we need to touch the "real" label (i.e. the text set inside the control,
     // using port-specific functions) instead of the string returned by GetLabel().
     //
     // we need to touch the "real" label (i.e. the text set inside the control,
     // using port-specific functions) instead of the string returned by GetLabel().
     //

-    // In fact, we must be careful not to touch the original label passed to 
+    // In fact, we must be careful not to touch the original label passed to

     // SetLabel() otherwise GetLabel() will behave in a strange way to the user
     // (e.g. returning a "Ver...ing" instead of "Very long string") !
     if (newlabel == DoGetLabel())
     // SetLabel() otherwise GetLabel() will behave in a strange way to the user
     // (e.g. returning a "Ver...ing" instead of "Very long string") !
     if (newlabel == DoGetLabel())


@@ -313,8 +312,6 @@ wxString wxStaticTextBase::GetEllipsizedLabelWithoutMarkup() const
     return ret;
 }
 
     return ret;
 }
 

-#define wxELLIPSE_REPLACEMENT       wxT("...")
-

 wxString wxStaticTextBase::Ellipsize(const wxString& label) const
 {
     wxSize sz(GetSize());
 wxString wxStaticTextBase::Ellipsize(const wxString& label) const
 {
     wxSize sz(GetSize());


@@ -324,169 +321,24 @@ wxString wxStaticTextBase::Ellipsize(const wxString& label) const
         return label;
     }
 
         return label;
     }
 

-    wxClientDC dc(wx_const_cast(wxStaticTextBase*, this));
+    wxClientDC dc(const_cast<wxStaticTextBase*>(this));

     dc.SetFont(GetFont());
 
     dc.SetFont(GetFont());
 

-    wxArrayInt charOffsets;
-    wxString ret;
-
-    // these cannot be cached as they can change because of e.g. a font change
-    int replacementWidth = dc.GetTextExtent(wxELLIPSE_REPLACEMENT).GetWidth();
-    int marginWidth = dc.GetCharWidth()*2;
-
-    // handle correctly labels with newlines
-    wxString curLine;
-    wxSize reqsize;
-    size_t len;
-    for ( wxString::const_iterator pc = label.begin(); ; ++pc )
+    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;
+    else

     {
     {

-        if ( pc == label.end() || *pc == _T('\n') )
-        {
-            len = curLine.length();
-            if (len > 0 &&
-                dc.GetPartialTextExtents(curLine, charOffsets))
-            {
-                wxASSERT(charOffsets.GetCount() == len);
+        wxFAIL_MSG( "should only be called if have one of wxST_ELLIPSIZE_XXX" );

 
 

-                size_t totalWidth = charOffsets.Last();
-                if ( totalWidth > (size_t)sz.GetWidth() )
-                {
-                    // we need to ellipsize this row
-                    int excessPixels = totalWidth - sz.GetWidth() + 
-                                       replacementWidth +
-                                       marginWidth;     // security margin (NEEDED!)
-
-                    // remove characters in excess
-                    size_t initialChar,     // index of first char to erase
-                           nChars;          // how many chars do we need to erase?
-                    if (HasFlag(wxST_ELLIPSIZE_START))
-                    {
-                        initialChar = 0;
-                        for (nChars=0;
-                             nChars < len && charOffsets[nChars] < excessPixels;
-                             nChars++)
-                            ;
-                    }
-                    else if (HasFlag(wxST_ELLIPSIZE_MIDDLE))
-                    {
-                        // the start & end of the removed span of chars
-                        initialChar = len/2;
-                        size_t endChar = len/2;
-
-                        int removed = 0;
-                        for ( ; removed < excessPixels; )
-                        {
-                            if (initialChar > 0)
-                            {
-                                // width of the initialChar-th character
-                                int width = charOffsets[initialChar] -
-                                            charOffsets[initialChar-1];
-
-                                // remove the initialChar-th character
-                                removed += width;
-                                initialChar--;
-                            }
-
-                            if (endChar < len - 1 &&
-                                removed < excessPixels)
-                            {
-                                // width of the (endChar+1)-th character
-                                int width = charOffsets[endChar+1] -
-                                            charOffsets[endChar];
-
-                                // remove the endChar-th character
-                                removed += width;
-                                endChar++;
-                            }
-
-                            if (initialChar == 0 && endChar == len-1)
-                            {
-                                nChars = len+1;
-                                break;
-                            }
-                        }
-
-                        initialChar++;
-                        nChars = endChar - initialChar + 1;
-                    }
-                    else
-                    {
-                        wxASSERT(HasFlag(wxST_ELLIPSIZE_END));
-                        wxASSERT(len > 0);
-
-                        int maxWidth = totalWidth - excessPixels;
-                        for (initialChar=0; 
-                             initialChar < len && 
-                             charOffsets[initialChar] < maxWidth; 
-                             initialChar++)
-                            ;
-
-                        if (initialChar == 0)
-                        {
-                            nChars = len;
-                        }
-                        else
-                        {
-                            initialChar--;      // go back one character 
-                            nChars = len - initialChar;
-                        }
-                    }
-
-                    if (nChars > len)
-                    {
-                        // need to remove the entire row!
-                        curLine.clear();
-                    }
-                    else
-                    {
-                        // erase nChars characters after initialChar (included):
-                        curLine.erase(initialChar, nChars+1);
-
-                        // if there is space for the replacement dots, add them
-                        if (sz.GetWidth() > replacementWidth)
-                            curLine.insert(initialChar, wxELLIPSE_REPLACEMENT);
-                    }
-
-                    // if everything was ok, we should have shortened this line
-                    // enough to make it fit in sz.GetWidth():
-                    wxASSERT(dc.GetTextExtent(curLine).GetWidth() < sz.GetWidth());
-                }
-            }
-
-            // add this (ellipsized) row to the rest of the label
-            ret << curLine;
-            if ( pc == label.end() )
-            {
-                return ret;
-            }
-            else
-            {
-                ret << *pc;
-                curLine.clear();
-            }
-        }
-        // we need to remove mnemonics from the label for correct calculations
-        else if ( *pc == _T('&') )
-        {
-            // pc+1 is safe: at worst we'll be at end()
-            wxString::const_iterator next = pc + 1;
-            if ( next != label.end() && *next == _T('&') )
-                curLine += _T('&');          // && becomes &
-            //else: remove this ampersand
-        }
-        // we need also to expand tabs to properly calc their size
-        else if ( *pc == _T('\t') )
-        {
-            // Windows natively expands the TABs to 6 spaces. Do the same:
-            curLine += wxT("      ");
-        }
-        else
-        {
-            curLine += *pc;
-        }
+        return label;

     }
 
     }
 

-    //return ret;
+    return wxControl::Ellipsize(label, dc, mode, sz.GetWidth());

 }
 
 #endif // wxUSE_STATTEXT
 }
 
 #endif // wxUSE_STATTEXT