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
This commit is contained in:
@@ -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)
|
dc.DrawText("Page: %d" % page, marginX/2, maxY-marginY)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
@@ -141,11 +141,11 @@ def makeBoxInBox(win):
|
|||||||
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
|
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
|
||||||
|
|
||||||
box2 = wxBoxSizer(wxHORIZONTAL)
|
box2 = wxBoxSizer(wxHORIZONTAL)
|
||||||
box2.AddMany([ (wxButton(win, 1010, "two"), 0, wxEXPAND),
|
box2.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
|
||||||
(wxButton(win, 1010, "three"), 0, wxEXPAND),
|
btn3 = wxButton(win, 1010, "three")
|
||||||
(wxButton(win, 1010, "four"), 0, wxEXPAND),
|
box2.Add(btn3, 0, wxEXPAND)
|
||||||
(wxButton(win, 1010, "five"), 0, wxEXPAND),
|
box2.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
|
||||||
])
|
box2.Add(wxButton(win, 1010, "five"), 0, wxEXPAND)
|
||||||
|
|
||||||
box3 = wxBoxSizer(wxVERTICAL)
|
box3 = wxBoxSizer(wxVERTICAL)
|
||||||
box3.AddMany([ (wxButton(win, 1010, "six"), 0, wxEXPAND),
|
box3.AddMany([ (wxButton(win, 1010, "six"), 0, wxEXPAND),
|
||||||
@@ -159,6 +159,8 @@ def makeBoxInBox(win):
|
|||||||
|
|
||||||
box.Add(wxButton(win, 1010, "ten"), 0, wxEXPAND)
|
box.Add(wxButton(win, 1010, "ten"), 0, wxEXPAND)
|
||||||
|
|
||||||
|
##box.Hide(btn3)
|
||||||
|
|
||||||
return box
|
return box
|
||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
@@ -64,7 +64,7 @@ class MyCanvas(wxScrolledWindow):
|
|||||||
self.DoDrawing(dc)
|
self.DoDrawing(dc)
|
||||||
|
|
||||||
|
|
||||||
def DoDrawing(self, dc):
|
def DoDrawing(self, dc, printing=False):
|
||||||
dc.BeginDrawing()
|
dc.BeginDrawing()
|
||||||
dc.SetPen(wxPen('RED'))
|
dc.SetPen(wxPen('RED'))
|
||||||
dc.DrawRectangle(5, 5, 50, 50)
|
dc.DrawRectangle(5, 5, 50, 50)
|
||||||
@@ -111,6 +111,10 @@ class MyCanvas(wxScrolledWindow):
|
|||||||
dc.SetPen(wxPen('RED'))
|
dc.SetPen(wxPen('RED'))
|
||||||
dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
|
dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
|
||||||
|
|
||||||
|
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
|
y = 20
|
||||||
for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
|
for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
|
||||||
pen = wxPen("DARK ORCHID", 1, style)
|
pen = wxPen("DARK ORCHID", 1, style)
|
||||||
|
Reference in New Issue
Block a user