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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 862d16456d3fe6e6c3e71267cf1326033f267aa3..29535072a7ae4ce72829327ddb500636b1e316b1 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -198,7 +198,7 @@ int Surface::LogPixelsY() {
 
 
 int Surface::DeviceHeightFont(int points) {
-    return points * LogPixelsY() / 72;
+    return points;
 }
 
 

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 862d16456d3fe6e6c3e71267cf1326033f267aa3..29535072a7ae4ce72829327ddb500636b1e316b1 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -198,7 +198,7 @@ int Surface::LogPixelsY() {
 
 
 int Surface::DeviceHeightFont(int points) {
-    return points * LogPixelsY() / 72;
+    return points;
 }
 
 

diff --git a/wxPython/demo/wxStyledTextCtrl_1.py b/wxPython/demo/wxStyledTextCtrl_1.py
index 76aba88b50cb9b6e72eca5ed589f533feaaee95f..e3421d47275151ca688748e9fcccf2a4e79bf00f 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_1.py
+++ b/wxPython/demo/wxStyledTextCtrl_1.py
@@ -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

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index 52597a671ebc0c38263ded7532fd578bee90f240..54b83aa2d2a86900cc29f06d646d3777c3137069 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -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',