Applied patch #418555: wxTextCtrl uses wrong background colour

[wxWidgets.git] / wxPython / demo / wxScrolledWindow.py

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index c248b4ba989c85fb1e9bc2def0231739e60febfe..5f90e34f5a0ae9fa35b4056e085838274c975f7e 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -1,6 +1,8 @@
 
 from wxPython.wx import *
 
 
 from wxPython.wx import *
 

+import images
+

 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):
 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):


@@ -20,7 +22,7 @@ class MyCanvas(wxScrolledWindow):
 
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
 
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))

-        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getTest2Bitmap()

         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         self.bmp = bmp
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         self.bmp = bmp


@@ -125,6 +127,27 @@ class MyCanvas(wxScrolledWindow):
             self.curLine = []
             self.ReleaseMouse()
 
             self.curLine = []
             self.ReleaseMouse()
 

+
+## This is an example of what to do for the EVT_MOUSEWHEEL event,
+## but since wxScrolledWindow does this already it's not
+## necessary to do it ourselves.
+
+##     wheelScroll = 0
+##     def OnWheel(self, evt):
+##         delta = evt.GetWheelDelta()
+##         rot = evt.GetWheelRotation()
+##         linesPer = evt.GetLinesPerAction()
+##         ws = self.wheelScroll
+##         ws = ws + rot
+##         lines = ws / delta
+##         ws = ws - lines * delta
+##         self.wheelScroll = ws
+##         if lines != 0:
+##             lines = lines * linesPer
+##             vsx, vsy = self.GetViewStart()
+##             scrollTo = vsy - lines
+##             self.Scroll(-1, scrollTo)
+

 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):