fixes for MSWGetCreateWindowFlags signature change

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index dbce9ffff6e8eb860a41dd36ec3e1488533e97bf..91b6a23e2891d1606f67cdf64efcca9df6150481 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -31,6 +31,7 @@
 #if wxUSE_TOOLBAR
 
 #ifndef WX_PRECOMP
+    #include "wx/control.h"
 #endif
 
 #include "wx/frame.h"
@@ -318,6 +319,8 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
             // found
             break;
         }
+
+        tool = NULL;
     }
 
     return tool;