diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.cpp b/wxPython/contrib/glcanvas/msw/glcanvas.cpp
index f7bf515b17..02c23f11e0 100644
--- a/wxPython/contrib/glcanvas/msw/glcanvas.cpp
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.cpp
@@ -1,5 +1,5 @@
 /*
- * FILE : msw/glcanvas.cpp
+ * FILE : contrib/glcanvas/msw/glcanvas.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
diff --git a/wxPython/demo/data/stc.h b/wxPython/demo/data/stc.h
index 847b17ec11..fc07f2f616 100644
--- a/wxPython/demo/data/stc.h
+++ b/wxPython/demo/data/stc.h
@@ -1232,6 +1232,14 @@ public:
     // Retrieve the point in the window where a position is displayed.
     wxPoint PointFromPosition(int pos);
 
+
+    // Scroll enough to make the given line visible
+    void ScrollToLine(int line);
+
+
+    // Scroll enough to make the given column visible
+    void ScrollToColumn(int column);
+
 //----------------------------------------------------------------------
 
 
diff --git a/wxPython/demo/data/stc.h.html b/wxPython/demo/data/stc.h.html
index 3220c268d0..38aa8c4391 100644
--- a/wxPython/demo/data/stc.h.html
+++ b/wxPython/demo/data/stc.h.html
@@ -1238,6 +1238,14 @@
     <FONT COLOR=#0000ff>// Retrieve the point in the window where a position is displayed.</FONT>
     wxPoint PointFromPosition(<B><FONT COLOR=#2e8b57>int</FONT></B> pos);
 
+
+    <FONT COLOR=#0000ff>// Scroll enough to make the given line visible</FONT>
+    <B><FONT COLOR=#2e8b57>void</FONT></B> ScrollToLine(<B><FONT COLOR=#2e8b57>int</FONT></B> line);
+
+
+    <FONT COLOR=#0000ff>// Scroll enough to make the given column visible</FONT>
+    <B><FONT COLOR=#2e8b57>void</FONT></B> ScrollToColumn(<B><FONT COLOR=#2e8b57>int</FONT></B> column);
+
 <FONT COLOR=#0000ff>//----------------------------------------------------------------------</FONT>
 
 
diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 72bea56345..1bfd2b2f8f 100644
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -241,7 +241,7 @@ public:
     void _setSelf(PyObject* self, PyObject* _class, int incref=1) {     \
         m_myInst.setSelf(self, _class, incref);                         \
     }                                                                   \
-    private: wxPyCallbackHelper m_myInst;
+    private: wxPyCallbackHelper m_myInst
 
 //---------------------------------------------------------------------------
 
diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp
index 051702a35a..9423cf72ed 100644
--- a/wxPython/src/msw/windows.cpp
+++ b/wxPython/src/msw/windows.cpp
@@ -1,5 +1,5 @@
 /*
- * FILE : msw/windows.cpp
+ * FILE : src/msw/windows.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)