don't compare wxList::compatibility_iterator with NULL, this operation is undefined...

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index eb9d222704637ed1457a0df233a7732beb765e20..1857727ebbef9c552fd951134feef712c3c988e7 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -1102,7 +1102,7 @@ bool wxToolBar::Realize()
     // find the maximum tool width and height
     wxToolBarTool *tool;
     wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     // find the maximum tool width and height
     wxToolBarTool *tool;
     wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();

-    while ( node != NULL )
+    while ( node )

     {
         tool = (wxToolBarTool *) node->GetData();
         if ( tool != NULL )
     {
         tool = (wxToolBarTool *) node->GetData();
         if ( tool != NULL )


@@ -1129,7 +1129,7 @@ bool wxToolBar::Realize()
 #endif
 
     node = m_tools.GetFirst();
 #endif
 
     node = m_tools.GetFirst();

-    while ( node != NULL )
+    while ( node )

     {
         tool = (wxToolBarTool*) node->GetData();
         if ( tool == NULL )
     {
         tool = (wxToolBarTool*) node->GetData();
         if ( tool == NULL )


@@ -1257,7 +1257,7 @@ bool wxToolBar::Realize()
                     DoToggleTool( tool, true );
 
                 wxToolBarToolsList::compatibility_iterator  nodePrev = node->GetPrevious();
                     DoToggleTool( tool, true );
 
                 wxToolBarToolsList::compatibility_iterator  nodePrev = node->GetPrevious();

-                while ( nodePrev != NULL )
+                while ( nodePrev )

                 {
                     wxToolBarToolBase   *toggleTool = nodePrev->GetData();
                     if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
                 {
                     wxToolBarToolBase   *toggleTool = nodePrev->GetData();
                     if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )


@@ -1401,7 +1401,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
     wxToolBarTool *tool;
     wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
 {
     wxToolBarTool *tool;
     wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();

-    while ( node != NULL )
+    while ( node )

     {
         tool = (wxToolBarTool *)node->GetData();
         if (tool != NULL)
     {
         tool = (wxToolBarTool *)node->GetData();
         if (tool != NULL)