Changed wxFont, wxPen, wxBrush to not implicitly use the wxTheXXXList
behind the scenes, but to use normal ctor and dtors. Exposed the wxTheXXXLists to wxPython. Also wxTheColourDatabase and added a library module to load LOTS more colour names into the colour database. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -42,16 +42,16 @@ class MyCanvas(wxScrolledWindow):
 | 
			
		||||
 | 
			
		||||
    def DoDrawing(self, dc):
 | 
			
		||||
        dc.BeginDrawing()
 | 
			
		||||
        pen1 = wxPen(wxNamedColour('RED'))
 | 
			
		||||
        dc.SetPen(pen1)
 | 
			
		||||
        #pen1 = wxPen(wxNamedColour('RED'))
 | 
			
		||||
        dc.SetPen(wxPen(wxNamedColour('RED')))
 | 
			
		||||
        dc.DrawRectangle(5, 5, 50, 50)
 | 
			
		||||
 | 
			
		||||
        dc.SetBrush(wxLIGHT_GREY_BRUSH)
 | 
			
		||||
        dc.SetPen(wxPen(wxNamedColour('BLUE'), 4))
 | 
			
		||||
        dc.DrawRectangle(15, 15, 50, 50)
 | 
			
		||||
 | 
			
		||||
        font = wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)
 | 
			
		||||
        dc.SetFont(font)
 | 
			
		||||
        #font = wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)
 | 
			
		||||
        dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL))
 | 
			
		||||
        dc.SetTextForeground(wxColour(0xFF, 0x20, 0xFF))
 | 
			
		||||
        te = dc.GetTextExtent("Hello World")
 | 
			
		||||
        dc.DrawText("Hello World", 60, 65)
 | 
			
		||||
@@ -81,12 +81,9 @@ class MyCanvas(wxScrolledWindow):
 | 
			
		||||
        dc.DrawRectangle(50,500,50,50)
 | 
			
		||||
        dc.DrawRectangle(100,500,50,50)
 | 
			
		||||
 | 
			
		||||
        dc.SetPen(pen1)
 | 
			
		||||
        dc.SetPen(wxPen(wxNamedColour('RED')))
 | 
			
		||||
        dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
 | 
			
		||||
 | 
			
		||||
        #from wxPython import dch
 | 
			
		||||
        #dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK)
 | 
			
		||||
 | 
			
		||||
        self.DrawSavedLines(dc)
 | 
			
		||||
        dc.EndDrawing()
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user