fix crash when repositioning tools without labels in DoDeleteTool() (ticket #9530)

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

diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 16bd76be16725f674805b32abca48fe80dab53b6..e8c47e5ed3e09a7ec923a530ca2bcf1e785f5a94 100644 (file)
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -581,13 +581,15 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
         wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
         if ( tool2->IsControl() )
         {
         wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
         if ( tool2->IsControl() )
         {

+            wxControl * const control = tool2->GetControl();
+

             int x;
             int x;

-            wxControl *control = tool2->GetControl();

             control->GetPosition(&x, NULL);
             control->Move(x - width, wxDefaultCoord);
 
             control->GetPosition(&x, NULL);
             control->Move(x - width, wxDefaultCoord);
 

-            wxStaticText* staticText = tool2->GetStaticText();
-            staticText->Move(x - width, wxDefaultCoord);
+            wxStaticText * const staticText = tool2->GetStaticText();
+            if ( staticText )
+                staticText->Move(x - width, wxDefaultCoord);

         }
     }
 
         }
     }