PR57: Mainly style changes, a few white space stuff and an xrange to range change.

* Phoenix FONTFAMILY, STYLE, WEIGHT Fixes
* PENSTYLE_ & BRUSHSTYLE_ Fixes
* Fix FONTWEIGHT to FONTSTYLE typo
* Phoenix Deprecations: wx.OPEN to wx.FD_OPEN
* Phoenix Deprecations: wx.SAVE to wx.FD_SAVE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2014-01-23 00:19:55 +00:00
parent 88066eefc1
commit ea181b5b72
70 changed files with 296 additions and 257 deletions

View File

@@ -214,11 +214,11 @@ class MegaImageRenderer(Grid.GridCellRenderer):
dc.SetBackgroundMode(wx.SOLID)
if isSelected:
dc.SetBrush(wx.Brush(wx.BLUE, wx.SOLID))
dc.SetPen(wx.Pen(wx.BLUE, 1, wx.SOLID))
dc.SetBrush(wx.Brush(wx.BLUE, wx.BRUSHSTYLE_SOLID))
dc.SetPen(wx.Pen(wx.BLUE, 1, wx.PENSTYLE_SOLID))
else:
dc.SetBrush(wx.Brush(wx.WHITE, wx.SOLID))
dc.SetPen(wx.Pen(wx.WHITE, 1, wx.SOLID))
dc.SetBrush(wx.Brush(wx.WHITE, wx.BRUSHSTYLE_SOLID))
dc.SetPen(wx.Pen(wx.WHITE, 1, wx.PENSTYLE_SOLID))
dc.DrawRectangleRect(rect)
@@ -242,9 +242,9 @@ class MegaFontRenderer(Grid.GridCellRenderer):
Grid.GridCellRenderer.__init__(self)
self.table = table
self.color = color
self.font = wx.Font(fontsize, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, font)
self.selectedBrush = wx.Brush("blue", wx.SOLID)
self.normalBrush = wx.Brush(wx.WHITE, wx.SOLID)
self.font = wx.Font(fontsize, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, font)
self.selectedBrush = wx.Brush("blue", wx.BRUSHSTYLE_SOLID)
self.normalBrush = wx.Brush(wx.WHITE, wx.BRUSHSTYLE_SOLID)
self.colSize = None
self.rowSize = 50
@@ -259,11 +259,11 @@ class MegaFontRenderer(Grid.GridCellRenderer):
dc.SetBackgroundMode(wx.SOLID)
if isSelected:
dc.SetBrush(wx.Brush(wx.BLUE, wx.SOLID))
dc.SetPen(wx.Pen(wx.BLUE, 1, wx.SOLID))
dc.SetBrush(wx.Brush(wx.BLUE, wx.BRUSHSTYLE_SOLID))
dc.SetPen(wx.Pen(wx.BLUE, 1, wx.PENSTYLE_SOLID))
else:
dc.SetBrush(wx.Brush(wx.WHITE, wx.SOLID))
dc.SetPen(wx.Pen(wx.WHITE, 1, wx.SOLID))
dc.SetBrush(wx.Brush(wx.WHITE, wx.BRUSHSTYLE_SOLID))
dc.SetPen(wx.Pen(wx.WHITE, 1, wx.PENSTYLE_SOLID))
dc.DrawRectangleRect(rect)
text = self.table.GetValue(row, col)