From f9747bcfed2744a5b47704a904efb2de62cc30ef Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 19 Jun 2003 19:29:17 +0000
Subject: [PATCH] Some demo tweaks and a bug workaround

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/demo/PrintFramework.py   |  2 +-
 wxPython/demo/Sizers.py           | 12 +++++++-----
 wxPython/demo/wxScrolledWindow.py | 26 +++++++++++++++-----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index 664735473f..d7a78e1dd4 100644
--- a/wxPython/demo/PrintFramework.py
+++ b/wxPython/demo/PrintFramework.py
@@ -79,7 +79,7 @@ class MyPrintout(wxPrintout):
 
         #-------------------------------------------
 
-        self.canvas.DoDrawing(dc)
+        self.canvas.DoDrawing(dc, True)
         dc.DrawText("Page: %d" % page, marginX/2, maxY-marginY)
 
         return True
diff --git a/wxPython/demo/Sizers.py b/wxPython/demo/Sizers.py
index ab95d06fd7..0fb4657edc 100644
--- a/wxPython/demo/Sizers.py
+++ b/wxPython/demo/Sizers.py
@@ -141,11 +141,11 @@ def makeBoxInBox(win):
     box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
 
     box2 = wxBoxSizer(wxHORIZONTAL)
-    box2.AddMany([ (wxButton(win, 1010, "two"), 0, wxEXPAND),
-                   (wxButton(win, 1010, "three"), 0, wxEXPAND),
-                   (wxButton(win, 1010, "four"), 0, wxEXPAND),
-                   (wxButton(win, 1010, "five"), 0, wxEXPAND),
-                   ])
+    box2.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
+    btn3 = wxButton(win, 1010, "three")
+    box2.Add(btn3, 0, wxEXPAND)
+    box2.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
+    box2.Add(wxButton(win, 1010, "five"), 0, wxEXPAND)
 
     box3 = wxBoxSizer(wxVERTICAL)
     box3.AddMany([ (wxButton(win, 1010, "six"),   0, wxEXPAND),
@@ -159,6 +159,8 @@ def makeBoxInBox(win):
 
     box.Add(wxButton(win, 1010, "ten"), 0, wxEXPAND)
 
+    ##box.Hide(btn3)
+
     return box
 
 #----------------------------------------------------------------------
diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index e9108418e8..67ac26e2fa 100644
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -64,7 +64,7 @@ class MyCanvas(wxScrolledWindow):
             self.DoDrawing(dc)
 
 
-    def DoDrawing(self, dc):
+    def DoDrawing(self, dc, printing=False):
         dc.BeginDrawing()
         dc.SetPen(wxPen('RED'))
         dc.DrawRectangle(5, 5, 50, 50)
@@ -111,16 +111,20 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxPen('RED'))
         dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
 
-        y = 20
-        for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
-            pen = wxPen("DARK ORCHID", 1, style)
-            if style == wxUSER_DASH:
-                pen.SetCap(wxCAP_BUTT)
-                pen.SetDashes([1,2])
-                pen.SetColour("RED")
-            dc.SetPen(pen)
-            dc.DrawLine(300, y, 400, y)
-            y = y + 10
+        if not printing:
+            # This has troubles when used on a print preview in wxGTK,
+            # probably something to do with the pen styles and the scaling
+            # it does...
+            y = 20
+            for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
+                pen = wxPen("DARK ORCHID", 1, style)
+                if style == wxUSER_DASH:
+                    pen.SetCap(wxCAP_BUTT)
+                    pen.SetDashes([1,2])
+                    pen.SetColour("RED")
+                dc.SetPen(pen)
+                dc.DrawLine(300, y, 400, y)
+                y = y + 10
 
         dc.SetBrush(wxTRANSPARENT_BRUSH)
         dc.SetPen(wxPen(wxColour(0xFF, 0x20, 0xFF), 1, wxSOLID))