Removed some old testing code. Added more appropriate minimal content.

[wxWidgets.git] / src / common / fontmgrcmn.cpp

diff --git a/src/common/fontmgrcmn.cpp b/src/common/fontmgrcmn.cpp
index 6a5d0683ec5fe4c1c2d2cb186754d45e7741aa54..7d7ef9d35d24464cb8dfe70777f1be4afd0fc8ce 100644 (file)
--- a/src/common/fontmgrcmn.cpp
+++ b/src/common/fontmgrcmn.cpp
@@ -24,9 +24,15 @@
 WX_DECLARE_LIST(wxFontInstance, wxFontInstanceList);
 WX_DEFINE_LIST(wxFontInstanceList)
 WX_DEFINE_LIST(wxFontBundleList)
 WX_DECLARE_LIST(wxFontInstance, wxFontInstanceList);
 WX_DEFINE_LIST(wxFontInstanceList)
 WX_DEFINE_LIST(wxFontBundleList)

+

 WX_DECLARE_HASH_MAP(wxString, wxFontBundle*,
                     wxStringHash, wxStringEqual,
 WX_DECLARE_HASH_MAP(wxString, wxFontBundle*,
                     wxStringHash, wxStringEqual,

-                    wxFontBundleHash);
+                    wxFontBundleHashBase);
+// in STL build, hash class is typedef to a template, so it can't be forward
+// declared, as we do; solve it by having a dummy class:
+class wxFontBundleHash : public wxFontBundleHashBase
+{
+};

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -65,17 +71,14 @@ wxFontInstance *wxFontFaceBase::GetFontInstance(float ptSize, bool aa)
 {
     wxASSERT_MSG( m_refCnt > 0, _T("font library not loaded!") );
 
 {
     wxASSERT_MSG( m_refCnt > 0, _T("font library not loaded!") );
 

-    wxFontInstance *i;
-    wxFontInstanceList::Node *node;
-
-    for ( node = m_instances->GetFirst(); node; node = node->GetNext() )
+    for ( wxFontInstanceList::const_iterator i = m_instances->begin();
+          i != m_instances->end(); ++i )

     {
     {

-        i = node->GetData();
-        if ( i->GetPointSize() == ptSize && i->IsAntiAliased() == aa )
-            return i;
+        if ( (*i)->GetPointSize() == ptSize && (*i)->IsAntiAliased() == aa )
+            return *i;

     }
 
     }
 

-    i = CreateFontInstance(ptSize, aa);
+    wxFontInstance *i = CreateFontInstance(ptSize, aa);

     m_instances->Append(i);
     return i;
 }
     m_instances->Append(i);
     return i;
 }


@@ -110,7 +113,8 @@ wxFontFace *wxFontBundleBase::GetFace(FaceType type) const
 wxFontFace *
 wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const
 {
 wxFontFace *
 wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const
 {

-    wxASSERT_MSG( font.GetFaceName().empty() || font.GetFaceName() == GetName(),
+    wxASSERT_MSG( font.GetFaceName().empty() ||
+                  GetName().CmpNoCase(font.GetFaceName()) == 0,

                   _T("calling GetFaceForFont for incompatible font") );
 
     int type = FaceType_Regular;
                   _T("calling GetFaceForFont for incompatible font") );
 
     int type = FaceType_Regular;


@@ -129,6 +133,8 @@ wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const
 
     if ( !HasFace((FaceType)type) )
     {
 
     if ( !HasFace((FaceType)type) )
     {

+        // if we can't get the exact font requested, substitute it with
+        // some other variant:

         for (int i = 0; i < FaceType_Max; i++)
         {
             if ( HasFace((FaceType)i) )
         for (int i = 0; i < FaceType_Max; i++)
         {
             if ( HasFace((FaceType)i) )