Removed font point size adjustment since wxWindows already does it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d11ec3df93
commit
9968ba85be
@ -198,7 +198,7 @@ int Surface::LogPixelsY() {
|
||||
|
||||
|
||||
int Surface::DeviceHeightFont(int points) {
|
||||
return points * LogPixelsY() / 72;
|
||||
return points;
|
||||
}
|
||||
|
||||
|
||||
|
@ -198,7 +198,7 @@ int Surface::LogPixelsY() {
|
||||
|
||||
|
||||
int Surface::DeviceHeightFont(int points) {
|
||||
return points * LogPixelsY() / 72;
|
||||
return points;
|
||||
}
|
||||
|
||||
|
||||
|
@ -36,7 +36,7 @@ if wxPlatform == '__WXMSW__':
|
||||
face1 = 'Arial'
|
||||
face2 = 'Times New Roman'
|
||||
face3 = 'Courier New'
|
||||
pb = 6
|
||||
pb = 10
|
||||
else:
|
||||
face1 = 'Helvetica'
|
||||
face2 = 'Times'
|
||||
@ -113,11 +113,11 @@ def runTest(frame, nb, log):
|
||||
ed.EmptyUndoBuffer()
|
||||
|
||||
# make some styles
|
||||
ed.StyleSetSpec(wxSTC_STYLE_DEFAULT, "size:%d,face:%s" % (pb+2, face3))
|
||||
ed.StyleSetSpec(1, "size:%d,bold,face:%s,fore:#0000FF" % (pb+3, face1))
|
||||
ed.StyleSetSpec(2, "face:%s,italic,fore:#FF0000,size:%d" % (face2, pb+2))
|
||||
ed.StyleSetSpec(3, "face:%s,bold,size:%d" % (face2, pb+3))
|
||||
ed.StyleSetSpec(4, "face:%s,size:%d" % (face1, pb))
|
||||
ed.StyleSetSpec(wxSTC_STYLE_DEFAULT, "size:%d,face:%s" % (pb, face3))
|
||||
ed.StyleSetSpec(1, "size:%d,bold,face:%s,fore:#0000FF" % (pb+2, face1))
|
||||
ed.StyleSetSpec(2, "face:%s,italic,fore:#FF0000,size:%d" % (face2, pb))
|
||||
ed.StyleSetSpec(3, "face:%s,bold,size:%d" % (face2, pb+2))
|
||||
ed.StyleSetSpec(4, "face:%s,size:%d" % (face1, pb-1))
|
||||
|
||||
|
||||
# now set some text to those styles... Normally this would be
|
||||
|
@ -21,8 +21,8 @@ if wxPlatform == '__WXMSW__':
|
||||
'mono' : 'Courier New',
|
||||
'helv' : 'Arial',
|
||||
'other': 'Comic Sans MS',
|
||||
'size' : 8,
|
||||
'size2': 6,
|
||||
'size' : 10,
|
||||
'size2': 8,
|
||||
}
|
||||
else:
|
||||
faces = { 'times': 'Times',
|
||||
|
Loading…
Reference in New Issue
Block a user