fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/src/common/fontmgrcmn.cpp b/src/common/fontmgrcmn.cpp
index ee2fe4915a632a983939130a9dafdfb9ecb016ea..86c88d8be2fbf22d85436202692ded2a8f47e0e9 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;
 }


@@ -222,19 +225,15 @@ void wxFontsManagerBase::AddBundle(wxFontBundle *bundle)
 // ----------------------------------------------------------------------------
 
 wxFontMgrFontRefData::wxFontMgrFontRefData(int size,
 // ----------------------------------------------------------------------------
 
 wxFontMgrFontRefData::wxFontMgrFontRefData(int size,

-                                           int family,
-                                           int style,
-                                           int weight,
+                                           wxFontFamily family,
+                                           wxFontStyle style,
+                                           wxFontWeight weight,

                                            bool underlined,
                                            const wxString& faceName,
                                            wxFontEncoding encoding)
 {
                                            bool underlined,
                                            const wxString& faceName,
                                            wxFontEncoding encoding)
 {

-    if ( family == wxDEFAULT )
-        family = wxSWISS;
-    if ( style == wxDEFAULT )
-        style = wxNORMAL;
-    if ( weight == wxDEFAULT )
-        weight = wxNORMAL;
+    if ( family == wxFONTFAMILY_DEFAULT )
+        family = wxFONTFAMILY_SWISS;

     if ( size == wxDEFAULT )
         size = 12;
 
     if ( size == wxDEFAULT )
         size = 12;
 


@@ -291,21 +290,21 @@ void wxFontMgrFontRefData::SetPointSize(int pointSize)
     m_fontValid = false;
 }
 
     m_fontValid = false;
 }
 

-void wxFontMgrFontRefData::SetFamily(int family)
+void wxFontMgrFontRefData::SetFamily(wxFontFamily family)

 {
 {

-    m_info.family = (wxFontFamily)family;
+    m_info.family = family;

     m_fontValid = false;
 }
 
     m_fontValid = false;
 }
 

-void wxFontMgrFontRefData::SetStyle(int style)
+void wxFontMgrFontRefData::SetStyle(wxFontStyle style)

 {
 {

-    m_info.style = (wxFontStyle)style;
+    m_info.style = style;

     m_fontValid = false;
 }
 
     m_fontValid = false;
 }
 

-void wxFontMgrFontRefData::SetWeight(int weight)
+void wxFontMgrFontRefData::SetWeight(wxFontWeight weight)

 {
 {

-    m_info.weight = (wxFontWeight)weight;
+    m_info.weight = weight;

     m_fontValid = false;
 }
 
     m_fontValid = false;
 }