More fool-proof lock in thread events code.

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

diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp
index e973cfdedbbbe6c48a436f63986048e5ababe7b0..662c6aa4f806a9fc9d7631490274d26dd6d183b6 100644 (file)
--- a/src/common/tbarsmpl.cpp
+++ b/src/common/tbarsmpl.cpp
@@ -21,7 +21,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+#include "wx/settings.h"
+#include "wx/window.h"
+#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
 #endif
 
 #if wxUSE_TOOLBAR
@@ -110,8 +113,8 @@ void wxToolBarSimple::OnKillFocus (wxFocusEvent& WXUNUSED(event))
 
 void wxToolBarSimple::OnMouseEvent ( wxMouseEvent & event )
 {
-    long x, y;
-    event.Position(&x, &y);
+    wxCoord x, y;
+    event.GetPosition(&x, &y);
     wxToolBarTool *tool = FindToolForPosition(x, y);
 
     if (event.LeftDown())
@@ -364,7 +367,7 @@ void wxToolBarSimple::SpringUpButton(int index)
   }
 }
 
-void wxToolBarSimple::Layout(void)
+void wxToolBarSimple::LayoutTools(void)
 {
   m_currentRowsOrColumns = 0;
   m_lastX = m_xMargin;