diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index 2dcd901785..8bb12dfb76 100644
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -280,8 +280,8 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
 
     def OnPopupOne(self, event):
         self.log.WriteText("Popup one\n")
-        print "FindItem:", self.list.FindItem(-1, "Billy Joel")
-        print "FindItemData:", self.list.FindItemData(-1, 20)
+        print "FindItem:", self.list.FindItem(-1, "Roxette")
+        print "FindItemData:", self.list.FindItemData(-1, 11)
 
     def OnPopupTwo(self, event):
         self.log.WriteText("Popup two\n")
diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 3c815ada18..e0ad207b73 100644
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -39,6 +39,7 @@ class MyCanvas(wxScrolledWindow):
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)
         EVT_PAINT(self, self.OnPaint)
+        ##EVT_MOUSEWHEEL(self, self.OnWheel)
 
 
     def getWidth(self):
@@ -109,7 +110,8 @@ class MyCanvas(wxScrolledWindow):
         for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
             pen = wxPen("DARK ORCHID", 1, style)
             if style == wxUSER_DASH:
-                pen.SetDashes([1, 2, 3, 4, 5, 6, 7, 8])
+                pen.SetCap(wxCAP_BUTT)
+                pen.SetDashes([1,2])
                 pen.SetColour("RED")
             dc.SetPen(pen)
             dc.DrawLine(300, y, 400, y)
@@ -188,6 +190,7 @@ class MyCanvas(wxScrolledWindow):
 ##         delta = evt.GetWheelDelta()
 ##         rot = evt.GetWheelRotation()
 ##         linesPer = evt.GetLinesPerAction()
+##         print delta, rot, linesPer
 ##         ws = self.wheelScroll
 ##         ws = ws + rot
 ##         lines = ws / delta
diff --git a/wxPython/distrib/zipit.bat b/wxPython/distrib/zipit.bat
index d85a3f56cd..ebb4928776 100755
--- a/wxPython/distrib/zipit.bat
+++ b/wxPython/distrib/zipit.bat
@@ -28,11 +28,9 @@ rem **** copy the docs into the tree
 md wxPython-%1\docs
 md wxPython-%1\docs\wx
 md wxPython-%1\docs\ogl
-copy %WXWIN%\docs\html\wx\*.gif wxPython-%1\docs\wx
-copy %WXWIN%\docs\html\wx\*.htm wxPython-%1\docs\wx
+copy %WXWIN%\docs\html\wx\*.* wxPython-%1\docs\wx
 copy wxPython-%1\docs\wx\wx.htm wxPython-%1\docs\wx\index.htm
-copy %WXWIN%\docs\html\ogl\*.gif wxPython-%1\docs\ogl
-copy %WXWIN%\docs\html\ogl\*.htm wxPython-%1\docs\ogl
+copy %WXWIN%\docs\html\ogl\*.* wxPython-%1\docs\ogl
 copy wxPython-%1\docs\ogl\ogl.htm wxPython-%1\docs\ogl\index.htm
 
 rem **** zip up the docs
diff --git a/wxPython/src/image.i b/wxPython/src/image.i
index ab9ccc65e9..84d1c7c5f0 100644
--- a/wxPython/src/image.i
+++ b/wxPython/src/image.i
@@ -191,6 +191,7 @@ public:
             dataPtr = (unsigned char*) malloc(len);
             memcpy(dataPtr, PyString_AsString(data), len);
             self->SetData(dataPtr);
+            // wxImage takes ownership of dataPtr...
         }
     }
 
diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 1298d96f1c..482f489f3b 100644
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -220,6 +220,8 @@ public:
 
     wxPoint GetPosition();
     wxSize GetSize();
+    void SetPosition( const wxPoint &p );
+    void SetSize( const wxSize &s );
 
     int  GetLeft();
     int  GetTop();
diff --git a/wxPython/wxPython/lib/buttons.py b/wxPython/wxPython/lib/buttons.py
index c0e6dfb8f0..62aaf6168e 100644
--- a/wxPython/wxPython/lib/buttons.py
+++ b/wxPython/wxPython/lib/buttons.py
@@ -159,8 +159,8 @@ class wxGenButton(wxPyControl):
         highlightClr = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNHIGHLIGHT)
         self.shadowPen    = wxPen(shadowClr, 1, wxSOLID)
         self.highlightPen = wxPen(highlightClr, 1, wxSOLID)
-        ##self.focusIndPen  = wxPen(textClr, 1, wxUSER_DASH)
-        self.focusIndPen = wxPen(textClr, 1, wxDOT)
+        self.focusIndPen  = wxPen(textClr, 1, wxUSER_DASH)
+        ##self.focusIndPen = wxPen(textClr, 1, wxDOT)
 
 
     def SetBackgroundColour(self, colour):
@@ -231,7 +231,8 @@ class wxGenButton(wxPyControl):
             self.focusIndPen.SetColour(self.GetForegroundColour())
         else:
             self.focusIndPen.SetColour(self.GetBackgroundColour())
-        ##self.focusIndPen.SetDashes([1,2,1,2])  # This isn't quite working the way I expected...
+        self.focusIndPen.SetDashes([1,1])
+        self.focusIndPen.SetCap(wxCAP_BUTT)
         dc.SetPen(self.focusIndPen)
         dc.SetBrush(wxTRANSPARENT_BRUSH)
         dc.DrawRectangle(bw+2,bw+2, w-bw*2-4, h-bw*2-4)