X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c8f2860735721e6cd0a140e7af0b7e55a72eb54..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/demo/ColourDB.py diff --git a/wxPython/demo/ColourDB.py b/wxPython/demo/ColourDB.py index e00652c734..a13d7e13b6 100644 --- a/wxPython/demo/ColourDB.py +++ b/wxPython/demo/ColourDB.py @@ -12,10 +12,9 @@ class TestWindow(wx.ScrolledWindow): wx.ScrolledWindow.__init__(self, parent, -1) # Populate our color list - self.clrList = wx.lib.colourdb.getColourList() + self.clrList = wx.lib.colourdb.getColourInfoList() # Just for style points, we'll use this as a background image. - #self.clrList.sort() self.bg_bmp = images.getGridBGBitmap() # This could also be done by getting the window's default font; @@ -53,6 +52,7 @@ class TestWindow(wx.ScrolledWindow): # Event handlers - moved here so events won't fire before init is # finished. + self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM) self.Bind(wx.EVT_PAINT, self.OnPaint) self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) @@ -73,7 +73,7 @@ class TestWindow(wx.ScrolledWindow): while x < sz.width: y = -dy while y < sz.height: - dc.DrawBitmap(self.bg_bmp, (x, y)) + dc.DrawBitmap(self.bg_bmp, x, y) y = y + h x = x + w @@ -97,7 +97,6 @@ class TestWindow(wx.ScrolledWindow): def Draw(self, dc, rgn=None, vs=None): - dc.BeginDrawing() dc.SetTextForeground("BLACK") dc.SetPen(wx.Pen("BLACK", 1, wx.SOLID)) dc.SetFont(self.font) @@ -118,18 +117,18 @@ class TestWindow(wx.ScrolledWindow): stop = numColours for line in range(max(0,start), min(stop,numColours)): - clr = colours[line] + clr = colours[line][0] y = (line+1) * self.lineHeight + 2 - # Updated for 2.5 - now takes tuple for pos - dc.DrawText(clr, (self.cellWidth, y)) + dc.DrawText(clr, self.cellWidth, y) brush = wx.Brush(clr, wx.SOLID) dc.SetBrush(brush) - dc.DrawRectangle((12 * self.cellWidth, y), - (6 * self.cellWidth, self.textHeight)) - - dc.EndDrawing() + dc.DrawRectangle(10 * self.cellWidth, y, + 6 * self.cellWidth, self.textHeight) + + dc.DrawText(str(tuple(colours[line][1:])), + 18 * self.cellWidth, y) # On wxGTK there needs to be a panel under wx.ScrolledWindows if they are