added msw.font.no-proof-quality system option as it makes more fonts available (featu...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 56730a7cde2eab7bbc4e2e42e3e4c228349fc058..72d38dfc23a7895ba8b98a1ac2155ee9c68897c3 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -153,6 +153,13 @@ wxX11:
 - Make Enter key activate the default button (David Hart)
 
 
 - Make Enter key activate the default button (David Hart)
 
 

+2.8.5
+-----
+
+wxMSW:
+
+- Added msw.font.no-proof-quality system option, see manual for description
+

 2.8.4
 -----
 
 2.8.4
 -----
 

diff --git a/docs/latex/wx/sysopt.tex b/docs/latex/wx/sysopt.tex
index 91009e1a7c35cf6bb507b56eac5fe23ae2fdc69c..7078bd6fa5ed16eeffcdd8dcb572e985365944e3 100644 (file)
--- a/docs/latex/wx/sysopt.tex
+++ b/docs/latex/wx/sysopt.tex
@@ -31,6 +31,11 @@ Setting this to 0 causes more flicker, but allows applications to paint graphics
 \twocolitem{msw.display.directdraw}{If set to 1, use DirectDraw-based implementation of
 \helpref{wxDisplay}{wxdisplay}. By default the standard Win32 functions are
 used.}
 \twocolitem{msw.display.directdraw}{If set to 1, use DirectDraw-based implementation of
 \helpref{wxDisplay}{wxdisplay}. By default the standard Win32 functions are
 used.}

+\twocolitem{msw.font.no-proof-quality}{If set to 1, use default fonts quality
+instead of proof quality when creating fonts. With proof quality the fonts
+have slightly better appearance but not all fonts are available in this
+quality, e.g. the Terminal font in small sizes is not and this option may be
+used if wider fonts selection is more important than higher quality.}

 \end{twocollist}
 
 \wxheading{GTK}
 \end{twocollist}
 
 \wxheading{GTK}

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index ffddf1c6a6f579e26e78133d9bc2c1a5acd784c8..8023ed0e3de4400c09b3176408eab011f50e8c46 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -39,6 +39,10 @@
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 

+#ifndef __WXWINCE__
+    #include "wx/sysopt.h"
+#endif
+

 #include "wx/tokenzr.h"
 
 #if wxUSE_EXTENDED_RTTI
 #include "wx/tokenzr.h"
 
 #if wxUSE_EXTENDED_RTTI


@@ -453,12 +457,16 @@ void wxNativeFontInfo::Init()
 {
     wxZeroMemory(lf);
 
 {
     wxZeroMemory(lf);
 

-    // we get better font quality if we use this instead of DEFAULT_QUALITY
-    // apparently without any drawbacks
+    // we get better font quality if we use PROOF_QUALITY instead of
+    // DEFAULT_QUALITY but some fonts (e.g. "Terminal 6pt") are not available
+    // then so we allow to set a global option to choose between quality and
+    // wider font selection

 #ifdef __WXWINCE__
     lf.lfQuality = CLEARTYPE_QUALITY;
 #else
 #ifdef __WXWINCE__
     lf.lfQuality = CLEARTYPE_QUALITY;
 #else

-    lf.lfQuality = PROOF_QUALITY;
+    lf.lfQuality = wxSystemOptions::GetOptionInt(_T("msw.font.no-proof-quality"))
+                    ? DEFAULT_QUALITY
+                    : PROOF_QUALITY;

 #endif
 }
 
 #endif
 }