From 345d60d357428ad6b23f6536dd17c11ed0329ad4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 3 Jun 2008 12:45:43 +0000 Subject: [PATCH] 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 --- src/msw/toolbar.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index 16bd76be16..e8c47e5ed3 100644 --- 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() ) { + wxControl * const control = tool2->GetControl(); + int x; - wxControl *control = tool2->GetControl(); 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); } } -- 2.45.2