convert bitmap's surface to RGB24/ARGB in wxBitmap::GetRawData() if it uses different...

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

diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp
index 8d94c2300ea0e1160fb6bcd3aa60f6bdcdd10275..7abfabaacfd1e97d01c15b9c3ba2ca3dce1fb6ff 100644 (file)
--- a/src/dfb/fontmgr.cpp
+++ b/src/dfb/fontmgr.cpp
@@ -37,6 +37,11 @@
 // wxFontInstance
 // ----------------------------------------------------------------------------
 
+// This is a fake "filename" for DirectFB's builtin font (which isn't loaded
+// from a file); we can't use empty string, because that's already used for
+// "this face is not available" by wxFontsManagerBase
+#define BUILTIN_DFB_FONT_FILENAME   "/dev/null"
+
 wxFontInstance::wxFontInstance(float ptSize, bool aa,
                                const wxString& filename)
     : wxFontInstanceBase(ptSize, aa)
@@ -55,7 +60,11 @@ wxFontInstance::wxFontInstance(float ptSize, bool aa,
                     DFDESC_ATTRIBUTES | DFDESC_FRACT_HEIGHT);
     desc.attributes = aa ? DFFA_NONE : DFFA_MONOCHROME;
     desc.fract_height = pixSize;
-    m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);
+
+    if ( filename == BUILTIN_DFB_FONT_FILENAME )
+        m_font = wxIDirectFB::Get()->CreateFont(NULL, &desc);
+    else
+        m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);
 
     wxASSERT_MSG( m_font, _T("cannot create font instance") );
 }
@@ -144,6 +153,12 @@ void wxFontsManager::AddAllFonts()
     {
         wxString dir = tkn.GetNextToken();
 
+        if ( !wxDir::Exists(dir) )
+        {
+            wxLogDebug(_T("font directory %s doesn't exist"), dir);
+            continue;
+        }
+
         wxArrayString indexFiles;
         if ( !wxDir::GetAllFiles(dir, &indexFiles, _T("FontsIndex")) )
             continue;
@@ -157,8 +172,23 @@ void wxFontsManager::AddAllFonts()
 
     if ( GetBundles().empty() )
     {
-        // wxDFB is unusable without fonts, so terminate the app
-        wxLogFatalError(_("No fonts found in %s."), path.c_str());
+        // We can fall back to the builtin default font if no other fonts are
+        // defined:
+        wxLogTrace(_T("font"),
+                   _("no fonts found in %s, using builtin font"), path);
+
+        AddBundle
+        (
+          new wxFontBundle
+              (
+                _("Default font"),
+                BUILTIN_DFB_FONT_FILENAME,
+                wxEmptyString,
+                wxEmptyString,
+                wxEmptyString,
+                false // IsFixed
+              )
+        );
     }
 }