some conflicts resolved

[wxWidgets.git] / utils / wxPython / demo / wxTimer.py

diff --git a/utils/wxPython/demo/wxTimer.py b/utils/wxPython/demo/wxTimer.py
index a32f3d35003674da3da5b5ac57a16737ae9ab635..14ad5941002c687c49217a11b038f0cf64956cd8 100644 (file)
--- a/utils/wxPython/demo/wxTimer.py
+++ b/utils/wxPython/demo/wxTimer.py
@@ -29,7 +29,7 @@ class TestTimerWin(wxPanel):
                                wxPoint(15, 30))
 
         wxButton(self, 11101, ' Start ', wxPoint(15, 75), wxDefaultSize)
-        wxButton(self, 11102, ' Stop ', wxPoint(77, 75), wxDefaultSize)
+        wxButton(self, 11102, ' Stop ', wxPoint(115, 75), wxDefaultSize)
         EVT_BUTTON(self, 11101, self.OnStart)
         EVT_BUTTON(self, 11102, self.OnStop)