fixing compilo for 10.5

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 337359dc073db63ff2123e404368384c13952dc8..7c093918c570fcbb2b5c346af57ac6c34cd591a3 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -1,5 +1,5 @@
-       /////////////////////////////////////////////////////////////////////////////
-// Name:        common/fontcmn.cpp
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fontcmn.cpp

 // Purpose:     implementation of wxFontBase methods
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxFontBase methods
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,32 +17,31 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "fontbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/font.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/font.h"
+    #include "wx/dc.h"

     #include "wx/intl.h"
     #include "wx/dcscreen.h"
     #include "wx/intl.h"
     #include "wx/dcscreen.h"

+    #include "wx/log.h"
+    #include "wx/gdicmn.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/gdicmn.h"
-

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-  #include  "wx/msw/winundef.h"
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+    #include  "wx/msw/winundef.h"

 #endif
 
 #include "wx/fontutil.h" // for wxNativeFontInfo
 #include "wx/fontmap.h"
 #endif
 
 #include "wx/fontutil.h" // for wxNativeFontInfo
 #include "wx/fontmap.h"

+#include "wx/fontenum.h"

 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 


@@ -56,13 +55,16 @@
 
 static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
 {
 
 static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
 {

-    int currentSize = font.GetPointSize();
+    int currentSize = 0;

     int largestGood = 0;
     int smallestBad = 0;
 
     bool initialGoodFound = false;
     bool initialBadFound = false;
 
     int largestGood = 0;
     int smallestBad = 0;
 
     bool initialGoodFound = false;
     bool initialBadFound = false;
 

+    // NB: this assignment was separated from the variable definition
+    // in order to fix a gcc v3.3.3 compiler crash
+    currentSize = font.GetPointSize();

     while (currentSize > 0)
     {
         dc.SetFont(font);
     while (currentSize > 0)
     {
         dc.SetFont(font);


@@ -265,6 +267,11 @@ wxString wxFontBase::GetNativeFontInfoDesc() const
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToString();
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToString();

+        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!"));

     }
 
     return fontDesc;
     }
 
     return fontDesc;


@@ -277,35 +284,40 @@ wxString wxFontBase::GetNativeFontInfoUserDesc() const
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToUserString();
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToUserString();

+        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!"));

     }
 
     return fontDesc;
 }
 
     }
 
     return fontDesc;
 }
 

-void wxFontBase::SetNativeFontInfo(const wxString& info)
+bool wxFontBase::SetNativeFontInfo(const wxString& info)

 {
     wxNativeFontInfo fontInfo;
     if ( !info.empty() && fontInfo.FromString(info) )
     {
         SetNativeFontInfo(fontInfo);
 {
     wxNativeFontInfo fontInfo;
     if ( !info.empty() && fontInfo.FromString(info) )
     {
         SetNativeFontInfo(fontInfo);

+        return true;

     }
     }

+
+    UnRef();
+    return false;

 }
 
 }
 

-void wxFontBase::SetNativeFontInfoUserDesc(const wxString& info)
+bool wxFontBase::SetNativeFontInfoUserDesc(const wxString& info)

 {
     wxNativeFontInfo fontInfo;
     if ( !info.empty() && fontInfo.FromUserString(info) )
     {
         SetNativeFontInfo(fontInfo);
 {
     wxNativeFontInfo fontInfo;
     if ( !info.empty() && fontInfo.FromUserString(info) )
     {
         SetNativeFontInfo(fontInfo);

+        return true;

     }
     }

-}
-
-wxFont& wxFont::operator=(const wxFont& font)
-{
-    if ( this != &font )
-        Ref(font);

 
 

-    return (wxFont &)*this;
+    UnRef();
+    return false;

 }
 
 bool wxFontBase::operator==(const wxFont& font) const
 }
 
 bool wxFontBase::operator==(const wxFont& font) const


@@ -316,11 +328,17 @@ bool wxFontBase::operator==(const wxFont& font) const
            (
             Ok() == font.Ok() &&
             GetPointSize() == font.GetPointSize() &&
            (
             Ok() == font.Ok() &&
             GetPointSize() == font.GetPointSize() &&

+            // in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
+            // operator==() resulting in infinite recursion so we can't use it
+            // in that port
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
+            GetPixelSize() == font.GetPixelSize() &&
+#endif

             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&
             GetWeight() == font.GetWeight() &&
             GetUnderlined() == font.GetUnderlined() &&
             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&
             GetWeight() == font.GetWeight() &&
             GetUnderlined() == font.GetUnderlined() &&

-            GetFaceName() == font.GetFaceName() &&
+            GetFaceName().IsSameAs(font.GetFaceName(), false) &&

             GetEncoding() == font.GetEncoding()
            );
 }
             GetEncoding() == font.GetEncoding()
            );
 }


@@ -372,10 +390,41 @@ wxString wxFontBase::GetWeightString() const
     }
 }
 
     }
 }
 

+bool wxFontBase::SetFaceName(const wxString &facename)
+{
+    if (!wxFontEnumerator::IsValidFacename(facename))
+    {
+        UnRef();        // make Ok() return false
+        return false;
+    }
+
+    return true;
+}
+
+

 // ----------------------------------------------------------------------------
 // wxNativeFontInfo
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxNativeFontInfo
 // ----------------------------------------------------------------------------
 

+// Up to now, there are no native implementations of this function:
+void wxNativeFontInfo::SetFaceName(const wxArrayString &facenames)
+{
+    for (size_t i=0; i < facenames.GetCount(); i++)
+    {
+        if (wxFontEnumerator::IsValidFacename(facenames[i]))
+        {
+            SetFaceName(facenames[i]);
+            return;
+        }
+    }
+
+    // set the first valid facename we can find on this system
+    wxString validfacename = wxFontEnumerator::GetFacenames().Item(0);
+    wxLogTrace(wxT("font"), wxT("Falling back to '%s'"), validfacename.c_str());
+    SetFaceName(validfacename);
+}
+
+

 #ifdef wxNO_NATIVE_FONTINFO
 
 // These are the generic forms of FromString()/ToString.
 #ifdef wxNO_NATIVE_FONTINFO
 
 // These are the generic forms of FromString()/ToString.


@@ -517,9 +566,10 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_)
     underlined = underlined_;
 }
 
     underlined = underlined_;
 }
 

-void wxNativeFontInfo::SetFaceName(wxString facename_)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename_)

 {
     faceName = facename_;
 {
     faceName = facename_;

+    return true;

 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family_)
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family_)


@@ -549,7 +599,7 @@ wxString wxNativeFontInfo::ToUserString() const
     // but what else can we do?
     if ( GetUnderlined() )
     {
     // but what else can we do?
     if ( GetUnderlined() )
     {

-        desc << _("underlined ");
+        desc << _("underlined");

     }
 
     switch ( GetWeight() )
     }
 
     switch ( GetWeight() )


@@ -562,11 +612,11 @@ wxString wxNativeFontInfo::ToUserString() const
             break;
 
         case wxFONTWEIGHT_LIGHT:
             break;
 
         case wxFONTWEIGHT_LIGHT:

-            desc << _("light ");
+            desc << _(" light");

             break;
 
         case wxFONTWEIGHT_BOLD:
             break;
 
         case wxFONTWEIGHT_BOLD:

-            desc << _("bold ");
+            desc << _(" bold");

             break;
     }
 
             break;
     }
 


@@ -582,7 +632,7 @@ wxString wxNativeFontInfo::ToUserString() const
             // we don't distinguish between the two for now anyhow...
         case wxFONTSTYLE_ITALIC:
         case wxFONTSTYLE_SLANT:
             // we don't distinguish between the two for now anyhow...
         case wxFONTSTYLE_ITALIC:
         case wxFONTSTYLE_SLANT:

-            desc << _("italic");
+            desc << _(" italic");

             break;
     }
 
             break;
     }
 


@@ -602,11 +652,11 @@ wxString wxNativeFontInfo::ToUserString() const
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {

-        desc << _T(' ') << wxFontMapper::Get()->GetEncodingName(enc);
+        desc << _T(' ') << wxFontMapper::GetEncodingName(enc);

     }
 #endif // wxUSE_FONTMAP
 
     }
 #endif // wxUSE_FONTMAP
 

-    return desc;
+    return desc.Strip(wxString::both).MakeLower();

 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)
 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)


@@ -621,10 +671,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 
     wxString face;
     unsigned long size;
 
     wxString face;
     unsigned long size;

-
-#if wxUSE_FONTMAP
-    wxFontEncoding encoding;
-#endif // wxUSE_FONTMAP
+    bool weightfound = false, pointsizefound = false, encodingfound = false;

 
     while ( tokenizer.HasMoreTokens() )
     {
 
     while ( tokenizer.HasMoreTokens() )
     {


@@ -641,10 +688,12 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         else if ( token == _T("light") || token == _("light") )
         {
             SetWeight(wxFONTWEIGHT_LIGHT);
         else if ( token == _T("light") || token == _("light") )
         {
             SetWeight(wxFONTWEIGHT_LIGHT);

+            weightfound = true;

         }
         else if ( token == _T("bold") || token == _("bold") )
         {
             SetWeight(wxFONTWEIGHT_BOLD);
         }
         else if ( token == _T("bold") || token == _("bold") )
         {
             SetWeight(wxFONTWEIGHT_BOLD);

+            weightfound = true;

         }
         else if ( token == _T("italic") || token == _("italic") )
         {
         }
         else if ( token == _T("italic") || token == _("italic") )
         {


@@ -653,16 +702,24 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         else if ( token.ToULong(&size) )
         {
             SetPointSize(size);
         else if ( token.ToULong(&size) )
         {
             SetPointSize(size);

+            pointsizefound = true;

         }
         }

+        else
+        {

 #if wxUSE_FONTMAP
 #if wxUSE_FONTMAP

-        else if ( (encoding = wxFontMapper::Get()->CharsetToEncoding(token, false))
-                    != wxFONTENCODING_DEFAULT )
+            // try to interpret this as an encoding
+            wxFontEncoding encoding = wxFontMapper::Get()->CharsetToEncoding(token, false);
+            if ( encoding != wxFONTENCODING_DEFAULT &&
+                 encoding != wxFONTENCODING_SYSTEM )    // returned when the recognition failed

         {
             SetEncoding(encoding);
         {
             SetEncoding(encoding);

+                encodingfound = true;

         }
         }

-#endif // wxUSE_FONTMAP
-        else // assume it is the face name
+            else

         {
         {

+#endif // wxUSE_FONTMAP
+
+                // assume it is the face name

             if ( !face.empty() )
             {
                 face += _T(' ');
             if ( !face.empty() )
             {
                 face += _T(' ');


@@ -672,6 +729,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 
             // skip the code which resets face below
             continue;
 
             // skip the code which resets face below
             continue;

+
+#if wxUSE_FONTMAP
+        }
+#endif // wxUSE_FONTMAP

         }
 
         // if we had had the facename, we shouldn't continue appending tokens
         }
 
         // if we had had the facename, we shouldn't continue appending tokens


@@ -679,7 +740,12 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         // bar")
         if ( !face.empty() )
         {
         // bar")
         if ( !face.empty() )
         {

-            SetFaceName(face);
+            // NB: the check on the facename is implemented in wxFontBase::SetFaceName
+            //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
+            //     call here wxFontEnumerator::IsValidFacename
+            if (!wxFontEnumerator::IsValidFacename(face) ||
+                !SetFaceName(face))
+                SetFaceName(wxNORMAL_FONT->GetFaceName());

             face.clear();
         }
     }
             face.clear();
         }
     }


@@ -687,11 +753,29 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
     // we might not have flushed it inside the loop
     if ( !face.empty() )
     {
     // we might not have flushed it inside the loop
     if ( !face.empty() )
     {

-        SetFaceName(face);
+        // NB: the check on the facename is implemented in wxFontBase::SetFaceName
+        //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
+        //     call here wxFontEnumerator::IsValidFacename
+        if (!wxFontEnumerator::IsValidFacename(face) ||
+            !SetFaceName(face))
+            SetFaceName(wxNORMAL_FONT->GetFaceName());

     }
 
     }
 

+    // set point size to default value if size was not given
+    if ( !pointsizefound )
+        SetPointSize(wxNORMAL_FONT->GetPointSize());
+
+    // set font weight to default value if weight was not given
+    if ( !weightfound )
+        SetWeight(wxFONTWEIGHT_NORMAL);
+
+#if wxUSE_FONTMAP
+    // set font encoding to default value if encoding was not given
+    if ( !encodingfound )
+        SetEncoding(wxFONTENCODING_SYSTEM);
+#endif // wxUSE_FONTMAP
+

     return true;
 }
 
 #endif // generic or wxMSW or wxOS2
     return true;
 }
 
 #endif // generic or wxMSW or wxOS2

-