wxWindow::Fit() infinite loop bug fixed

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 582ea1e9bb997d6073de67d4a3301fc5938ec36a..87709ad66a4b3dcc167a3a3f55fcca2783800481 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -350,8 +350,9 @@ void wxWindowBase::Fit()
     int maxX = 0,
         maxY = 0;
 
     int maxX = 0,
         maxY = 0;
 

-    wxWindowList::Node *node = GetChildren().GetFirst();
-    while ( node )
+    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )

     {
         wxWindow *win = node->GetData();
         if ( win->IsTopLevel() )
     {
         wxWindow *win = node->GetData();
         if ( win->IsTopLevel() )


@@ -368,8 +369,6 @@ void wxWindowBase::Fit()
             maxX = wx + ww;
         if ( wy + wh > maxY )
             maxY = wy + wh;
             maxX = wx + ww;
         if ( wy + wh > maxY )
             maxY = wy + wh;

-
-        node = node->GetNext();

     }
 
     // leave a margin
     }
 
     // leave a margin