X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..fc447c7f43c83835241265b48641a569be54e332:/src/html/htmlcell.cpp

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 986f6436f0..90dfc46e46 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWidgets Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -775,7 +775,7 @@ void wxHtmlContainerCell::Layout(int w)
                 // between two cells separated by, e.g. font change, cell which
                 // is wrong
 
-                const int step = s_width - xpos;
+                int step = s_width - xpos;
                 if ( step > 0 )
                 {
                     // first count the cells which will get extra space
@@ -783,7 +783,7 @@ void wxHtmlContainerCell::Layout(int w)
 
                     const wxHtmlCell *c,
                                      *prev = NULL,
-                                     *next = NULL;
+                                     *next wxDUMMY_INITIALIZE(NULL);
                     for ( c = line; c != cell; prev = c, c = next )
                     {
                         next = c->GetNext();
@@ -800,7 +800,7 @@ void wxHtmlContainerCell::Layout(int w)
                     {
                         prev =
                         next = NULL;
-                        for ( int n = 0; line != cell; line = line->GetNext() )
+                        for ( int n = 0; line != cell; prev = line, line = line->GetNext() )
                         {
                             line->SetPos(line->GetPosX() + s_indent +
                                            ((n * step) / total),
@@ -818,8 +818,14 @@ void wxHtmlContainerCell::Layout(int w)
                             }
                         }
                     }
+                    else
+                    {
+                        // this will cause the code to enter "else branch" below:
+                        step = 0;
+                    }
                 }
-                else // no extra space to distribute
+                // else branch:
+                if ( step <= 0 ) // no extra space to distribute
                 {
                     // just set the indent properly
                     while (line != cell)