Added ComputeHistogram

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 0ddb230f4b86d4a19db80bf2ca733c9349f8b4bd..2f855b19a83cd4ef6747ef3e34cdc6329635a9ab 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -35,7 +35,6 @@
 
 #include "wx/tbarbase.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxToolBarBase, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
 
@@ -44,7 +43,6 @@ BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
   EVT_SIZE(wxToolBarBase::OnSize)
   EVT_IDLE(wxToolBarBase::OnIdle)
 END_EVENT_TABLE()
-#endif
 
 // Keep a list of all toolbars created, so you can tell whether a toolbar
 // is still valid: a tool may have quit the toolbar.
@@ -90,12 +88,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()