Fix function wxControlBase::DoEllipsizeSingleLine to really make sure that the ellips...

Add comments to explain in more details what the function does and in particular the valid ranges of all internal variables; fix in that regard both the code of both wxELLIPSIZE_START, wxELLIPSIZE_MIDDLE and wxELLIPSIZE_END.
Add more asserts to check the valid ranges and turn a couple of time-expensive checks in level-2 asserts.
Add a test unit for the wxControl::Ellipsize function.
Fix minor details in the docs of wxControl::Ellipsize.
Closes #11567.

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

diff --git a/interface/wx/control.h b/interface/wx/control.h
index d96a9bc28ce5ca7ee2a4b86d791480a8c179d716..5823f312628cbc04bb51a5505dccacc6683947f4 100644 (file)
--- a/interface/wx/control.h
+++ b/interface/wx/control.h
@@ -96,6 +96,10 @@ public:
     /**
         Replaces parts of the @a label string with ellipsis, if needed, so
         that it doesn't exceed @a maxWidth.
     /**
         Replaces parts of the @a label string with ellipsis, if needed, so
         that it doesn't exceed @a maxWidth.

+        
+        Note that this functions is guaranteed to always returns a string
+        whose rendering on the given DC takes less than @a maxWidth pixels
+        in horizontal.

 
         @param label
             The string to ellipsize
 
         @param label
             The string to ellipsize


@@ -103,11 +107,15 @@ public:
             The DC used to retrieve the character widths through the
             wxDC::GetPartialTextExtents() function.
         @param mode
             The DC used to retrieve the character widths through the
             wxDC::GetPartialTextExtents() function.
         @param mode

-            The ellipsization modes. See ::wxEllipsizeMode.
+            The ellipsization mode. This is the setting which determines
+            which part of the string should be replaced by the ellipsis.
+            See ::wxEllipsizeMode enumeration values for more info.

         @param maxWidth
             The maximum width of the returned string in pixels.
         @param maxWidth
             The maximum width of the returned string in pixels.

+            This argument determines how much characters of the string need to
+            be removed (and replaced by ellipsis).

         @param flags
         @param flags

-            One or more of the ::wxEllipsize
+            One or more of the ::wxEllipsizeFlags enumeration values combined.

     */
     static wxString Ellipsize(const wxString& label, const wxDC& dc,
                               wxEllipsizeMode mode, int maxWidth,
     */
     static wxString Ellipsize(const wxString& label, const wxDC& dc,
                               wxEllipsizeMode mode, int maxWidth,

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index a96c7a89b448e4e0a095d15739fd4b294fa52d7f..851237fe56f4d9ad74ae2195b811292360c6e238 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -242,8 +242,8 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
 {
     wxASSERT_MSG(replacementWidthPx > 0 && marginWidthPx > 0,
                  "Invalid parameters");
 {
     wxASSERT_MSG(replacementWidthPx > 0 && marginWidthPx > 0,
                  "Invalid parameters");

-    wxASSERT_MSG(!curLine.Contains('\n'),
-                 "Use Ellipsize() instead!");
+    wxASSERT_LEVEL_2_MSG(!curLine.Contains('\n'),
+                         "Use Ellipsize() instead!");

 
     wxASSERT_MSG( mode != wxELLIPSIZE_NONE, "shouldn't be called at all then" );
 
 
     wxASSERT_MSG( mode != wxELLIPSIZE_NONE, "shouldn't be called at all then" );
 


@@ -261,92 +261,107 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
 
     wxASSERT(charOffsetsPx.GetCount() == len);
 
 
     wxASSERT(charOffsetsPx.GetCount() == len);
 

+    // NOTE: charOffsetsPx[n] is the width in pixels of the first n characters (with the last one INCLUDED)
+    //       thus charOffsetsPx[len-1] is the total width of the string

     size_t totalWidthPx = charOffsetsPx.Last();
     if ( totalWidthPx <= (size_t)maxFinalWidthPx )
         return curLine;     // we don't need to do any ellipsization!
 
     size_t totalWidthPx = charOffsetsPx.Last();
     if ( totalWidthPx <= (size_t)maxFinalWidthPx )
         return curLine;     // we don't need to do any ellipsization!
 

-    int excessPx = totalWidthPx - maxFinalWidthPx +
-                   replacementWidthPx +
-                   marginWidthPx;     // security margin (NEEDED!)
-    wxASSERT(excessPx>0);
+    int excessPx = wxMin(totalWidthPx - maxFinalWidthPx +
+                         replacementWidthPx +
+                         marginWidthPx,     // security margin
+                         totalWidthPx);
+    wxASSERT(excessPx>0);       // excessPx should be in the [1;totalWidthPx] range

 
 

-    // remove characters in excess
-    size_t initialCharToRemove,     // index of first char to erase
-           nCharsToRemove;          // how many chars do we need to erase?
+    // REMEMBER: indexes inside the string have a valid range of [0;len-1] if not otherwise constrained
+    //           lengths/counts of characters (e.g. nCharsToRemove) have a valid range of [0;len] if not otherwise constrained
+    // NOTE: since this point we know we have for sure a non-empty string from which we need
+    //       to remove _at least_ one character (thus nCharsToRemove below is constrained to be >= 1)

 
 

+    size_t initialCharToRemove,     // index of first character to erase, valid range is [0;len-1]
+           nCharsToRemove;          // how many chars do we need to erase? valid range is [1;len-initialCharToRemove]
+
+    // let's compute the range of characters to remove depending on the ellipsization mode:

     switch (mode)
     {
         case wxELLIPSIZE_START:
             initialCharToRemove = 0;
     switch (mode)
     {
         case wxELLIPSIZE_START:
             initialCharToRemove = 0;

-            for ( nCharsToRemove=0;
-                  nCharsToRemove < len && charOffsetsPx[nCharsToRemove] < excessPx;
+            for ( nCharsToRemove = 1;
+                  nCharsToRemove < len && charOffsetsPx[nCharsToRemove-1] < excessPx;

                   nCharsToRemove++ )
                 ;
             break;
 
         case wxELLIPSIZE_MIDDLE:
             {
                   nCharsToRemove++ )
                 ;
             break;
 
         case wxELLIPSIZE_MIDDLE:
             {

-                // the start & end of the removed span of chars
+                // NOTE: the following piece of code works also when len == 1
+
+                // start the removal process from the middle of the string
+                // i.e. separe the string in three parts: 
+                // - the first one to preserve, valid range [0;initialCharToRemove-1] or the empty range if initialCharToRemove==0
+                // - the second one to remove, valid range [initialCharToRemove;endCharToRemove]
+                // - the third one to preserve, valid range [endCharToRemove+1;len-1] or the empty range if endCharToRemove==len-1
+                // NOTE: empty range != range [0;0] since the range [0;0] contains 1 character (the zero-th one)!

                 initialCharToRemove = len/2;
                 initialCharToRemove = len/2;

-                size_t endChar = len/2;
+                size_t endCharToRemove = len/2;     // index of the last character to remove; valid range is [0;len-1]

 
                 int removedPx = 0;
                 for ( ; removedPx < excessPx; )
                 {
 
                 int removedPx = 0;
                 for ( ; removedPx < excessPx; )
                 {

+                    // try to remove the last character of the first part of the string

                     if (initialCharToRemove > 0)
                     {
                     if (initialCharToRemove > 0)
                     {

-                        // widthPx of the initialCharToRemove-th character
-                        int widthPx = charOffsetsPx[initialCharToRemove] -
-                                      charOffsetsPx[initialCharToRemove-1];
-
-                        // remove the initialCharToRemove-th character
-                        removedPx += widthPx;
+                        // width of the (initialCharToRemove-1)-th character
+                        int widthPx;
+                        if (initialCharToRemove >= 2)
+                            widthPx = charOffsetsPx[initialCharToRemove-1] - charOffsetsPx[initialCharToRemove-2];
+                        else
+                            widthPx = charOffsetsPx[initialCharToRemove-1];     
+                                // the (initialCharToRemove-1)-th character is the first char of the string
+                        
+                        wxASSERT(widthPx >= 0);     // widthPx is zero for e.g. tab characters
+
+                        // mark the (initialCharToRemove-1)-th character as removable

                         initialCharToRemove--;
                         initialCharToRemove--;

+                        removedPx += widthPx;

                     }
 
                     }
 

-                    if (endChar < len - 1 &&
+                    // try to remove the first character of the last part of the string
+                    if (endCharToRemove < len - 1 &&

                         removedPx < excessPx)
                     {
                         removedPx < excessPx)
                     {

-                        // widthPx of the (endChar+1)-th character
-                        int widthPx = charOffsetsPx[endChar+1] -
-                                      charOffsetsPx[endChar];
+                        // width of the (endCharToRemove+1)-th character
+                        int widthPx = charOffsetsPx[endCharToRemove+1] -
+                                      charOffsetsPx[endCharToRemove];
+
+                        wxASSERT(widthPx >= 0);     // widthPx is zero for e.g. tab characters

 
 

-                        // remove the endChar-th character
+                        // mark the (endCharToRemove+1)-th character as removable
+                        endCharToRemove++;

                         removedPx += widthPx;
                         removedPx += widthPx;

-                        endChar++;

                     }
 
                     }
 

-                    if (initialCharToRemove == 0 && endChar == len-1)
+                    if (initialCharToRemove == 0 && endCharToRemove == len-1)

                     {
                     {

-                        nCharsToRemove = len+1;
+                        // we need to remove all the characters of the string!

                         break;
                     }
                 }
 
                         break;
                     }
                 }
 

-                initialCharToRemove++;
-                nCharsToRemove = endChar - initialCharToRemove + 1;
+                nCharsToRemove = endCharToRemove - initialCharToRemove + 1;

             }
             break;
 
         case wxELLIPSIZE_END:
             {
             }
             break;
 
         case wxELLIPSIZE_END:
             {

-                wxASSERT(len > 0);
-

                 int maxWidthPx = totalWidthPx - excessPx;
                 int maxWidthPx = totalWidthPx - excessPx;

-                for ( initialCharToRemove = 0;
-                      initialCharToRemove < len && charOffsetsPx[initialCharToRemove] < maxWidthPx;
-                      initialCharToRemove++ )
-                    ;

 
 

-                if (initialCharToRemove == 0)
-                {
-                    nCharsToRemove = len;
-                }
-                else
-                {
-                    //initialCharToRemove--;      // go back one character
-                    nCharsToRemove = len - initialCharToRemove;
-                }
+                // go backward from the end of the string toward the start
+                for ( initialCharToRemove = len-1;
+                      initialCharToRemove > 0 && charOffsetsPx[initialCharToRemove-1] > maxWidthPx;
+                      initialCharToRemove-- )
+                    ;
+                nCharsToRemove = len - initialCharToRemove;

             }
             break;
 
             }
             break;
 


@@ -356,25 +371,31 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
             return curLine;
     }
 
             return curLine;
     }
 

+    wxASSERT(initialCharToRemove >= 0 && initialCharToRemove <= len-1);  // see valid range for initialCharToRemove above
+    wxASSERT(nCharsToRemove >= 1 && nCharsToRemove <= len-initialCharToRemove);  // see valid range for nCharsToRemove above
+
+    // erase nCharsToRemove characters after initialCharToRemove (included);
+    // e.g. if we have the string "foobar" (len = 6)
+    //                               ^
+    //                               \--- initialCharToRemove = 2
+    //      and nCharsToRemove = 2, then we get "foar"

     wxString ret(curLine);
     wxString ret(curLine);

-    if (nCharsToRemove >= len)
-    {
-        // need to remove the entire row!
-        ret.clear();
-    }
-    else
-    {
-        // erase nCharsToRemove characters after initialCharToRemove (included):
-        ret.erase(initialCharToRemove, nCharsToRemove+1);
+    ret.erase(initialCharToRemove, nCharsToRemove);

 
 

-        // if there is space for the replacement dots, add them
-        if (maxFinalWidthPx > replacementWidthPx)
-            ret.insert(initialCharToRemove, wxELLIPSE_REPLACEMENT);
-    }
+    int removedPx;
+    if (initialCharToRemove >= 1)
+        removedPx = charOffsetsPx[initialCharToRemove+nCharsToRemove-1] - charOffsetsPx[initialCharToRemove-1];
+    else 
+        removedPx = charOffsetsPx[initialCharToRemove+nCharsToRemove-1];
+    wxASSERT(removedPx >= excessPx);
+
+    // if there is space for the replacement dots, add them
+    if ((int)totalWidthPx-removedPx+replacementWidthPx < maxFinalWidthPx)
+        ret.insert(initialCharToRemove, wxELLIPSE_REPLACEMENT);

 
     // if everything was ok, we should have shortened this line
     // enough to make it fit in maxFinalWidthPx:
 
     // if everything was ok, we should have shortened this line
     // enough to make it fit in maxFinalWidthPx:

-    wxASSERT(dc.GetTextExtent(ret).GetWidth() < maxFinalWidthPx);
+    wxASSERT_LEVEL_2(dc.GetTextExtent(ret).GetWidth() <= maxFinalWidthPx);

 
     return ret;
 }
 
     return ret;
 }

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8895dba60cb4819e6dbe610d567e2e0d706974a6..e9516311086a0a536da079846a90efa4946fec24 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -136,6 +136,7 @@ TEST_GUI_OBJECTS =  \
        test_gui_size.o \
        test_gui_point.o \
        test_gui_colour.o \
        test_gui_size.o \
        test_gui_point.o \
        test_gui_colour.o \

+       test_gui_ellipsization.o \

        test_gui_measuring.o \
        test_gui_config.o \
        test_gui_comboboxtest.o \
        test_gui_measuring.o \
        test_gui_config.o \
        test_gui_comboboxtest.o \


@@ -573,6 +574,9 @@ test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP)
 test_gui_colour.o: $(srcdir)/graphics/colour.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/colour.cpp
 
 test_gui_colour.o: $(srcdir)/graphics/colour.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/colour.cpp
 

+test_gui_ellipsization.o: $(srcdir)/graphics/ellipsization.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/ellipsization.cpp
+

 test_gui_measuring.o: $(srcdir)/graphics/measuring.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/measuring.cpp
 
 test_gui_measuring.o: $(srcdir)/graphics/measuring.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/measuring.cpp
 

diff --git a/tests/graphics/ellipsization.cpp b/tests/graphics/ellipsization.cpp
new file mode 100644 (file)
index 0000000..c8d3a22
--- /dev/null
+++ b/tests/graphics/ellipsization.cpp
@@ -0,0 +1,78 @@
+///////////////////////////////////////////////////////////////////////////////\r
+// Name:        tests/graphics/ellipsization.cpp\r
+// Purpose:     wxControlBase::*Ellipsize* unit test\r
+// Author:      Francesco Montorsi\r
+// Created:     2010-03-10\r
+// RCS-ID:      $Id$\r
+// Copyright:   (c) 2010 Francesco Montorsi\r
+///////////////////////////////////////////////////////////////////////////////\r
+\r
+// ----------------------------------------------------------------------------\r
+// headers\r
+// ----------------------------------------------------------------------------\r
+\r
+#include "testprec.h"\r
+\r
+#ifdef __BORLANDC__\r
+    #pragma hdrstop\r
+#endif\r
+\r
+#include "wx/control.h"\r
+#include "wx/dcmemory.h"\r
+\r
+// ----------------------------------------------------------------------------\r
+// test class\r
+// ----------------------------------------------------------------------------\r
+\r
+class EllipsizationTestCase : public CppUnit::TestCase\r
+{\r
+public:\r
+    EllipsizationTestCase() { }\r
+\r
+private:\r
+    CPPUNIT_TEST_SUITE( EllipsizationTestCase );\r
+        CPPUNIT_TEST( Ellipsize );\r
+    CPPUNIT_TEST_SUITE_END();\r
+\r
+    void Ellipsize();\r
+\r
+    DECLARE_NO_COPY_CLASS(EllipsizationTestCase)\r
+};\r
+\r
+// register in the unnamed registry so that these tests are run by default\r
+CPPUNIT_TEST_SUITE_REGISTRATION( EllipsizationTestCase );\r
+\r
+// also include in it's own registry so that these tests can be run alone\r
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EllipsizationTestCase, "EllipsizationTestCase" );\r
+\r
+void EllipsizationTestCase::Ellipsize()\r
+{\r
+    wxMemoryDC dc;\r
+\r
+    wxString stringsToTest[] = \r
+    { \r
+        "N", ".", "x", "foobar", wxS("\u03B1"), "Another test", "a very very very very very very very long string",\r
+        "\xCE\xB1\xCE\xB2\xCE\xB3\xCE\xB4\xCE\xB5\xCE\xB6\xCE\xB7\xCE\xB8\xCE\xB9", \r
+            // alpha+beta+gamma+delta+epsilon+zeta+eta+theta+iota\r
+        "\t", "\t\t\t\t\t", "a\tstring\twith\ttabs",\r
+        "\n", "\n\n\n\n\n", "a\nstring\nwith\nnewlines",\r
+        "&", "&&&&&&&", "a&string&with&newlines",\r
+        "\t\n&", "a\t\n&string\t\n&with\t\n&many\t\n&chars"\r
+    };\r
+    int flagsToTest[] = { 0, wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS, wxELLIPSIZE_FLAGS_EXPAND_TABS, \r
+                          wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS|wxELLIPSIZE_FLAGS_EXPAND_TABS };\r
+    wxEllipsizeMode modesToTest[] = { wxELLIPSIZE_START, wxELLIPSIZE_MIDDLE, wxELLIPSIZE_END };\r
+    int widthsToTest[] = { 0, 1, 2, 3, 10, 20, 100 };\r
+\r
+    for (unsigned int s=0; s<WXSIZEOF(stringsToTest); s++)\r
+        for (unsigned int f=0; f<WXSIZEOF(flagsToTest); f++)\r
+            for (unsigned int m=0; m<WXSIZEOF(modesToTest); m++)\r
+                for (unsigned int w=0; w<WXSIZEOF(widthsToTest); w++)\r
+                {\r
+                    wxString ret = wxControlBase::Ellipsize(stringsToTest[s], dc, modesToTest[m], \r
+                                                            widthsToTest[w], flagsToTest[f]);\r
+\r
+                    CPPUNIT_ASSERT_MESSAGE((std::string)("invalid ellipsization for: " + stringsToTest[s]),\r
+                                           dc.GetMultiLineTextExtent(ret).GetWidth() <= widthsToTest[w]);\r
+                }\r
+}\r

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 8f917e31b2ee25dcae96d7b7210deb5dd3840702..d1d085adbf747589b9b868f4a89e7091c25ea1b3 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -121,6 +121,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_size.obj \\r
        $(OBJS)\test_gui_point.obj \\r
        $(OBJS)\test_gui_colour.obj \\r
        $(OBJS)\test_gui_size.obj \\r
        $(OBJS)\test_gui_point.obj \\r
        $(OBJS)\test_gui_colour.obj \\r

+       $(OBJS)\test_gui_ellipsization.obj \\r

        $(OBJS)\test_gui_measuring.obj \\r
        $(OBJS)\test_gui_config.obj \\r
        $(OBJS)\test_gui_comboboxtest.obj \\r
        $(OBJS)\test_gui_measuring.obj \\r
        $(OBJS)\test_gui_config.obj \\r
        $(OBJS)\test_gui_comboboxtest.obj \\r


@@ -627,6 +628,9 @@ $(OBJS)\test_gui_point.obj: .\geometry\point.cpp
 $(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp\r
 \r
 $(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp\r
 \r

+$(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\ellipsization.cpp\r
+\r

 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
 \r
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
 \r

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index ed845b3e8df0fb06942124b1381ad15ed4c353c9..53fffc15f1806a90db0e6511d522ac8ef28ea57f 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -115,6 +115,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_size.o \\r
        $(OBJS)\test_gui_point.o \\r
        $(OBJS)\test_gui_colour.o \\r
        $(OBJS)\test_gui_size.o \\r
        $(OBJS)\test_gui_point.o \\r
        $(OBJS)\test_gui_colour.o \\r

+       $(OBJS)\test_gui_ellipsization.o \\r

        $(OBJS)\test_gui_measuring.o \\r
        $(OBJS)\test_gui_config.o \\r
        $(OBJS)\test_gui_comboboxtest.o \\r
        $(OBJS)\test_gui_measuring.o \\r
        $(OBJS)\test_gui_config.o \\r
        $(OBJS)\test_gui_comboboxtest.o \\r


@@ -609,6 +610,9 @@ $(OBJS)\test_gui_point.o: ./geometry/point.cpp
 $(OBJS)\test_gui_colour.o: ./graphics/colour.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\test_gui_colour.o: ./graphics/colour.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r

+$(OBJS)\test_gui_ellipsization.o: ./graphics/ellipsization.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r

 $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/tests/makefile.vc b/tests/makefile.vc
index b44729897da3fc26cd2b76fb21f45321f5498d5f..87a97c3c526dc36facd90c99b4ca30ad9020f83e 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -116,6 +116,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_size.obj \\r
        $(OBJS)\test_gui_point.obj \\r
        $(OBJS)\test_gui_colour.obj \\r
        $(OBJS)\test_gui_size.obj \\r
        $(OBJS)\test_gui_point.obj \\r
        $(OBJS)\test_gui_colour.obj \\r

+       $(OBJS)\test_gui_ellipsization.obj \\r

        $(OBJS)\test_gui_measuring.obj \\r
        $(OBJS)\test_gui_config.obj \\r
        $(OBJS)\test_gui_comboboxtest.obj \\r
        $(OBJS)\test_gui_measuring.obj \\r
        $(OBJS)\test_gui_config.obj \\r
        $(OBJS)\test_gui_comboboxtest.obj \\r


@@ -753,6 +754,9 @@ $(OBJS)\test_gui_point.obj: .\geometry\point.cpp
 $(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp\r
 \r
 $(OBJS)\test_gui_colour.obj: .\graphics\colour.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\colour.cpp\r
 \r

+$(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\ellipsization.cpp\r
+\r

 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
 \r
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
 \r

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 63af9a4cbb628e8437dfbd098651b7a06585d1b9..f43ac68775c2bf5ba57c0a0f5f2acedc4d2bc713 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -359,6 +359,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_size.obj &\r
        $(OBJS)\test_gui_point.obj &\r
        $(OBJS)\test_gui_colour.obj &\r
        $(OBJS)\test_gui_size.obj &\r
        $(OBJS)\test_gui_point.obj &\r
        $(OBJS)\test_gui_colour.obj &\r

+       $(OBJS)\test_gui_ellipsization.obj &\r

        $(OBJS)\test_gui_measuring.obj &\r
        $(OBJS)\test_gui_config.obj &\r
        $(OBJS)\test_gui_comboboxtest.obj &\r
        $(OBJS)\test_gui_measuring.obj &\r
        $(OBJS)\test_gui_config.obj &\r
        $(OBJS)\test_gui_comboboxtest.obj &\r


@@ -664,6 +665,9 @@ $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp
 $(OBJS)\test_gui_colour.obj :  .AUTODEPEND .\graphics\colour.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_colour.obj :  .AUTODEPEND .\graphics\colour.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_ellipsization.obj :  .AUTODEPEND .\graphics\ellipsization.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

diff --git a/tests/test.bkl b/tests/test.bkl
index 06ad988d7742132fb2f5ca14acd859c84cd8c13d..77bc56251c6c3dea95cd3b7c2e7c748aade1ff3a 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -117,6 +117,7 @@
             geometry/size.cpp
             geometry/point.cpp
             graphics/colour.cpp
             geometry/size.cpp
             geometry/point.cpp
             graphics/colour.cpp

+            graphics/ellipsization.cpp

             graphics/measuring.cpp
             config/config.cpp
             controls/comboboxtest.cpp
             graphics/measuring.cpp
             config/config.cpp
             controls/comboboxtest.cpp

diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index c19945267f6dda647d3acfaf42842dd68257b79a..55121786ebbb3d480702917a2abecb2c8173403b 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -261,6 +261,10 @@ SOURCE=.\dummy.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=.\graphics\ellipsization.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=.\font\fonttest.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=.\font\fonttest.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 52e773618139cbd94994bdbe74e05a529282098d..6b0092f821ef43a34ae5422dd4a9ca259baf32a9 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -631,6 +631,9 @@
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\graphics\ellipsization.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\font\fonttest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\font\fonttest.cpp">\r
                        </File>\r

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index ec87e6d203a20c904a761757edc2d64a1e67a38f..ecf5fdfa717a509b69578b4db6e51ab486981091 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -915,6 +915,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\graphics\ellipsization.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\font\fonttest.cpp"\r
                                >\r
                        <File\r
                                RelativePath=".\font\fonttest.cpp"\r
                                >\r

diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 7a899aa08d84c7c3a19c13a525dabb28322ce2a1..941eb998ca5b22189f37a65d69f3631e21271569 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -887,6 +887,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\graphics\ellipsization.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\font\fonttest.cpp"\r
                                >\r
                        <File\r
                                RelativePath=".\font\fonttest.cpp"\r
                                >\r