Add missing WXK constants for the control keys

[wxWidgets.git] / src / dfb / fontmgr.cpp

diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp
index 3913b995f8803c1a4bef5e33d0d4e830f920cb4a..817b4f5572b46990f73bd670d55ca8d1bb418468 100644 (file)
--- a/src/dfb/fontmgr.cpp
+++ b/src/dfb/fontmgr.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/gdicmn.h"

     #include "wx/utils.h"
     #include "wx/log.h"
 #endif
     #include "wx/utils.h"
     #include "wx/log.h"
 #endif


@@ -46,14 +47,10 @@ wxFontInstance::wxFontInstance(float ptSize, bool aa,
                                const wxString& filename)
     : wxFontInstanceBase(ptSize, aa)
 {
                                const wxString& filename)
     : wxFontInstanceBase(ptSize, aa)
 {

-    int scrSizePx, scrSizeMM;
-    wxDisplaySize(NULL, &scrSizePx);
-    wxDisplaySizeMM(NULL, &scrSizeMM);
-    double dpi = (scrSizePx / (scrSizeMM * mm2inches));

     // NB: DFB's fract_height value is 32bit integer with the last 6 bit
     //     representing fractional value, hence the multiplication by 64;
     //     1pt=1/72inch, hence "/ 72"
     // NB: DFB's fract_height value is 32bit integer with the last 6 bit
     //     representing fractional value, hence the multiplication by 64;
     //     1pt=1/72inch, hence "/ 72"

-    int pixSize = int(ptSize * dpi * 64 / 72);
+    int pixSize = int(ptSize * wxGetDisplayPPI().y * 64 / 72);

 
     DFBFontDescription desc;
     desc.flags = (DFBFontDescriptionFlags)(
 
     DFBFontDescription desc;
     desc.flags = (DFBFontDescriptionFlags)(


@@ -146,7 +143,7 @@ void wxFontsManager::AddAllFonts()
 {
     wxString path;
     if ( !wxGetEnv("WXDFB_FONTPATH", &path) )
 {
     wxString path;
     if ( !wxGetEnv("WXDFB_FONTPATH", &path) )

-        path = _T(wxINSTALL_PREFIX "/share/wx/fonts");
+        path = wxT(wxINSTALL_PREFIX "/share/wx/fonts");

 
     wxStringTokenizer tkn(path, wxPATH_SEP);
     while ( tkn.HasMoreTokens() )
 
     wxStringTokenizer tkn(path, wxPATH_SEP);
     while ( tkn.HasMoreTokens() )