Various little tweaks

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

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 76d83ee7146b82481d94081c539e1573e02f3712..e0ad207b73c710469d4734ff0e6788034b5e06ca 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -3,6 +3,8 @@ from wxPython.wx import *
 
 import images
 
+BUFFERED = 1
+
 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):
@@ -12,14 +14,11 @@ class MyCanvas(wxScrolledWindow):
         self.lines = []
         self.maxWidth  = 1000
         self.maxHeight = 1000
-        self.count = 0
+        self.x = self.y = 0
+        self.curLine = []
+        self.drawing = false
 
         self.SetBackgroundColour("WHITE")
-        EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
-        EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
-        EVT_MOTION(self,    self.OnLeftButtonEvent)
-        EVT_PAINT(self, self.OnPaint)
-
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)
@@ -28,6 +27,20 @@ class MyCanvas(wxScrolledWindow):
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
 
+        if BUFFERED:
+            # Initialize the buffer bitmap.  No real DC is needed at this point.
+            self.buffer = wxEmptyBitmap(self.maxWidth, self.maxHeight)
+            dc = wxBufferedDC(None, self.buffer)
+            dc.SetBackground(wxBrush(self.GetBackgroundColour()))
+            dc.Clear()
+            self.DoDrawing(dc)
+
+        EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
+        EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
+        EVT_MOTION(self,    self.OnLeftButtonEvent)
+        EVT_PAINT(self, self.OnPaint)
+        ##EVT_MOUSEWHEEL(self, self.OnWheel)
+
 
     def getWidth(self):
         return self.maxWidth
@@ -37,12 +50,18 @@ class MyCanvas(wxScrolledWindow):
 
 
     def OnPaint(self, event):
-        #self.count += 1
-        #print self.count, "begin paint...",
-        dc = wxPaintDC(self)
-        self.PrepareDC(dc)
-        self.DoDrawing(dc)
-        #print "end paint"
+        if BUFFERED:
+            # Create a buffered paint DC.  It will create the real
+            # wxPaintDC and then blit the bitmap to it when dc is
+            # deleted.  Since we don't need to draw anything else
+            # here that's all there is to it.
+            dc = wxBufferedPaintDC(self, self.buffer)
+        else:
+            dc = wxPaintDC(self)
+            self.PrepareDC(dc)
+            # since we're not buffering in this case, we have to
+            # paint the whole window, potentially very time consuming.
+            self.DoDrawing(dc)
 
 
     def DoDrawing(self, dc):
@@ -91,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)
@@ -107,7 +127,6 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(old_pen)
         dc.DrawRectangle(490, 90, 20, 20)
 
-
         self.DrawSavedLines(dc)
         dc.EndDrawing()
 
@@ -133,10 +152,19 @@ class MyCanvas(wxScrolledWindow):
             self.SetXY(event)
             self.curLine = []
             self.CaptureMouse()
+            self.drawing = true
+
+        elif event.Dragging() and self.drawing:
+            if BUFFERED:
+                # If doing buffered drawing, create the buffered DC, giving it
+                # it a real DC to blit to when done.
+                cdc = wxClientDC(self)
+                self.PrepareDC(cdc)
+                dc = wxBufferedDC(cdc, self.buffer)
+            else:
+                dc = wxClientDC(self)
+                self.PrepareDC(dc)
 
-        elif event.Dragging():
-            dc = wxClientDC(self)
-            self.PrepareDC(dc)
             dc.BeginDrawing()
             dc.SetPen(wxPen('MEDIUM FOREST GREEN', 4))
             coords = (self.x, self.y) + self.ConvertEventCoords(event)
@@ -145,10 +173,12 @@ class MyCanvas(wxScrolledWindow):
             self.SetXY(event)
             dc.EndDrawing()
 
-        elif event.LeftUp():
+
+        elif event.LeftUp() and self.drawing:
             self.lines.append(self.curLine)
             self.curLine = []
             self.ReleaseMouse()
+            self.drawing = false
 
 
 ## This is an example of what to do for the EVT_MOUSEWHEEL event,
@@ -160,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
@@ -183,13 +214,14 @@ def runTest(frame, nb, log):
 
 
 
+overview = """\
+"""
 
 
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-
-
-
-overview = """\
-"""