Added wxMSW wxChoice::GetClassDefaultAttributes(), initially used in wxComboCtrl

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

diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp
index 7abfabaacfd1e97d01c15b9c3ba2ca3dce1fb6ff..817b4f5572b46990f73bd670d55ca8d1bb418468 100644 (file)
--- a/src/dfb/fontmgr.cpp
+++ b/src/dfb/fontmgr.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
     #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)
 {
-    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"
-    int pixSize = int(ptSize * dpi * 64 / 72);
+    int pixSize = int(ptSize * wxGetDisplayPPI().y * 64 / 72);
 
     DFBFontDescription desc;
     desc.flags = (DFBFontDescriptionFlags)(
@@ -66,7 +63,7 @@ wxFontInstance::wxFontInstance(float ptSize, bool aa,
     else
         m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);
 
-    wxASSERT_MSG( m_font, _T("cannot create font instance") );
+    wxASSERT_MSG( m_font, "cannot create font instance" );
 }
 
 // ----------------------------------------------------------------------------
@@ -145,8 +142,8 @@ wxFontBundle::wxFontBundle(const wxString& name,
 void wxFontsManager::AddAllFonts()
 {
     wxString path;
-    if ( !wxGetEnv(_T("WXDFB_FONTPATH"), &path) )
-        path = _T(wxINSTALL_PREFIX "/share/wx/fonts");
+    if ( !wxGetEnv("WXDFB_FONTPATH", &path) )
+        path = wxT(wxINSTALL_PREFIX "/share/wx/fonts");
 
     wxStringTokenizer tkn(path, wxPATH_SEP);
     while ( tkn.HasMoreTokens() )
@@ -155,12 +152,12 @@ void wxFontsManager::AddAllFonts()
 
         if ( !wxDir::Exists(dir) )
         {
-            wxLogDebug(_T("font directory %s doesn't exist"), dir);
+            wxLogDebug("font directory %s doesn't exist", dir);
             continue;
         }
 
         wxArrayString indexFiles;
-        if ( !wxDir::GetAllFiles(dir, &indexFiles, _T("FontsIndex")) )
+        if ( !wxDir::GetAllFiles(dir, &indexFiles, "FontsIndex") )
             continue;
 
         for ( wxArrayString::const_iterator i = indexFiles.begin();
@@ -174,7 +171,7 @@ void wxFontsManager::AddAllFonts()
     {
         // We can fall back to the builtin default font if no other fonts are
         // defined:
-        wxLogTrace(_T("font"),
+        wxLogTrace("font",
                    _("no fonts found in %s, using builtin font"), path);
 
         AddBundle
@@ -204,7 +201,7 @@ void wxFontsManager::AddFontsFromDir(const wxString& indexFile)
         return;
     }
 
-    wxLogTrace(_T("font"), _T("adding fonts from %s"), dir.c_str());
+    wxLogTrace("font", "adding fonts from %s", dir.c_str());
 
     wxFileConfig cfg(wxEmptyString, wxEmptyString,
                      indexFile, wxEmptyString,
@@ -231,27 +228,27 @@ ReadFilePath(const wxString& name, const wxString& dir, wxFileConfig& cfg)
     if ( p.empty() || wxFileName(p).IsAbsolute() )
         return p;
 
-    return dir + _T("/") + p;
+    return dir + "/" + p;
 }
 
 void wxFontsManager::AddFont(const wxString& dir,
                              const wxString& name,
                              wxFileConfig& cfg)
 {
-    wxLogTrace(_T("font"), _T("adding font '%s'"), name.c_str());
+    wxLogTrace("font", "adding font '%s'", name.c_str());
 
-    wxConfigPathChanger ch(&cfg, wxString::Format(_T("/%s/"), name.c_str()));
+    wxConfigPathChanger ch(&cfg, wxString::Format("/%s/", name.c_str()));
 
     AddBundle
     (
       new wxFontBundle
           (
             name,
-            ReadFilePath(_T("Regular"), dir, cfg),
-            ReadFilePath(_T("Italic"), dir, cfg),
-            ReadFilePath(_T("Bold"), dir, cfg),
-            ReadFilePath(_T("BoldItalic"), dir, cfg),
-            cfg.Read(_T("IsFixed"), (long)false)
+            ReadFilePath("Regular", dir, cfg),
+            ReadFilePath("Italic", dir, cfg),
+            ReadFilePath("Bold", dir, cfg),
+            ReadFilePath("BoldItalic", dir, cfg),
+            cfg.Read("IsFixed", (long)false)
           )
     );
 }
@@ -260,7 +257,7 @@ void wxFontsManager::SetDefaultFonts(wxFileConfig& cfg)
 {
     wxString name;
 
-    if ( cfg.Read(_T("Default"), &name) )
+    if ( cfg.Read("Default", &name) )
     {
         m_defaultFacenames[wxFONTFAMILY_DECORATIVE] =
         m_defaultFacenames[wxFONTFAMILY_ROMAN] =
@@ -270,16 +267,16 @@ void wxFontsManager::SetDefaultFonts(wxFileConfig& cfg)
         m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name;
     }
 
-    if ( cfg.Read(_T("DefaultDecorative"), &name) )
+    if ( cfg.Read("DefaultDecorative", &name) )
         m_defaultFacenames[wxFONTFAMILY_DECORATIVE] = name;
-    if ( cfg.Read(_T("DefaultRoman"), &name) )
+    if ( cfg.Read("DefaultRoman", &name) )
         m_defaultFacenames[wxFONTFAMILY_ROMAN] = name;
-    if ( cfg.Read(_T("DefaultScript"), &name) )
+    if ( cfg.Read("DefaultScript", &name) )
         m_defaultFacenames[wxFONTFAMILY_SCRIPT] = name;
-    if ( cfg.Read(_T("DefaultSwiss"), &name) )
+    if ( cfg.Read("DefaultSwiss", &name) )
         m_defaultFacenames[wxFONTFAMILY_SWISS] = name;
-    if ( cfg.Read(_T("DefaultModern"), &name) )
+    if ( cfg.Read("DefaultModern", &name) )
         m_defaultFacenames[wxFONTFAMILY_MODERN] = name;
-    if ( cfg.Read(_T("DefaultTeletype"), &name) )
+    if ( cfg.Read("DefaultTeletype", &name) )
         m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name;
 }