diff --git a/wxPython/demo/wxIEHtmlWin.py b/wxPython/demo/wxIEHtmlWin.py
index a09476159b..cad8b8bafd 100644
--- a/wxPython/demo/wxIEHtmlWin.py
+++ b/wxPython/demo/wxIEHtmlWin.py
@@ -9,7 +9,7 @@ if wxPlatform == '__WXMSW__':
 class TestPanel(wxWindow):
     def __init__(self, parent, log, frame=None):
         wxWindow.__init__(self, parent, -1,
-                          style=wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE)
+                          style=wxTAB_TRAVERSAL|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE)
         self.log = log
         self.current = "http://wxWindows.org/"
         self.frame = frame
diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i
index 84b81d7d4f..5e93aacf1e 100644
--- a/wxPython/src/stattool.i
+++ b/wxPython/src/stattool.i
@@ -196,7 +196,7 @@ public:
 
         // Insert the new tool at the given position, if pos == GetToolsCount(), it
         // is equivalent to DoAddTool()
-        wxToolBarToolBase *InsertTool(size_t pos,
+        wxToolBarToolBase *DoInsertTool(size_t pos,
                                       int id,
                                       const wxString& label,
                                       const wxBitmap& bitmap,