X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bec54e1287b639f16efd4ed0a9aa7cf1a7dcb77..6962f34ea5bf7a931bb9b636f46ad1316473a724:/src/common/tbarbase.cpp?ds=sidebyside

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 93e0bab7c7..91b6a23e28 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -28,8 +28,10 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TOOLBAR
+
 #ifndef WX_PRECOMP
-    #include "wx/wx.h"
+    #include "wx/control.h"
 #endif
 
 #include "wx/frame.h"
@@ -39,22 +41,18 @@
 #include <windows.h>
 #endif
 
-#if wxUSE_TOOLBAR
-
 #include "wx/tbarbase.h"
 
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-    BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
-        EVT_IDLE(wxToolBarBase::OnIdle)
-    END_EVENT_TABLE()
-#endif
-
 IMPLEMENT_CLASS(wxToolBarBase, wxControl)
 
+BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
+    EVT_IDLE(wxToolBarBase::OnIdle)
+END_EVENT_TABLE()
+
 #include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxToolBarToolsList);
@@ -321,6 +319,8 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
             // found
             break;
         }
+
+        tool = NULL;
     }
 
     return tool;