X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ccf68ce7c9fc6ff8f5e539e94f8103dfcae7896..848bc5ba1888bfa9fcbf5719b68a155ece28d7f6:/src/common/tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 0ddb230f4b..615d76c560 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -90,12 +90,14 @@ wxToolBarTool::wxToolBarTool(int theIndex,
   }
   m_shortHelpString = helpS1;
   m_longHelpString = helpS2;
+  m_control = (wxControl*) NULL;
 }
 
 wxToolBarTool::wxToolBarTool(wxControl *control)
 {
     m_toolStyle = wxTOOL_STYLE_CONTROL;
     m_control = control;
+    m_index = control->GetId();
 }
 
 wxToolBarTool::~wxToolBarTool()