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:
Robin Dunn
2001-09-10 21:57:26 +00:00
parent d11ec3df93
commit 9968ba85be
4 changed files with 10 additions and 10 deletions

View File

@@ -198,7 +198,7 @@ int Surface::LogPixelsY() {
int Surface::DeviceHeightFont(int points) { int Surface::DeviceHeightFont(int points) {
return points * LogPixelsY() / 72; return points;
} }

View File

@@ -198,7 +198,7 @@ int Surface::LogPixelsY() {
int Surface::DeviceHeightFont(int points) { int Surface::DeviceHeightFont(int points) {
return points * LogPixelsY() / 72; return points;
} }

View File

@@ -36,7 +36,7 @@ if wxPlatform == '__WXMSW__':
face1 = 'Arial' face1 = 'Arial'
face2 = 'Times New Roman' face2 = 'Times New Roman'
face3 = 'Courier New' face3 = 'Courier New'
pb = 6 pb = 10
else: else:
face1 = 'Helvetica' face1 = 'Helvetica'
face2 = 'Times' face2 = 'Times'
@@ -113,11 +113,11 @@ def runTest(frame, nb, log):
ed.EmptyUndoBuffer() ed.EmptyUndoBuffer()
# make some styles # make some styles
ed.StyleSetSpec(wxSTC_STYLE_DEFAULT, "size:%d,face:%s" % (pb+2, face3)) ed.StyleSetSpec(wxSTC_STYLE_DEFAULT, "size:%d,face:%s" % (pb, face3))
ed.StyleSetSpec(1, "size:%d,bold,face:%s,fore:#0000FF" % (pb+3, face1)) 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+2)) ed.StyleSetSpec(2, "face:%s,italic,fore:#FF0000,size:%d" % (face2, pb))
ed.StyleSetSpec(3, "face:%s,bold,size:%d" % (face2, pb+3)) ed.StyleSetSpec(3, "face:%s,bold,size:%d" % (face2, pb+2))
ed.StyleSetSpec(4, "face:%s,size:%d" % (face1, pb)) ed.StyleSetSpec(4, "face:%s,size:%d" % (face1, pb-1))
# now set some text to those styles... Normally this would be # now set some text to those styles... Normally this would be

View File

@@ -21,8 +21,8 @@ if wxPlatform == '__WXMSW__':
'mono' : 'Courier New', 'mono' : 'Courier New',
'helv' : 'Arial', 'helv' : 'Arial',
'other': 'Comic Sans MS', 'other': 'Comic Sans MS',
'size' : 8, 'size' : 10,
'size2': 6, 'size2': 8,
} }
else: else:
faces = { 'times': 'Times', faces = { 'times': 'Times',