Applied #9011: Native wxListCtrl::HitTest on OS X

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 887145f0e097226515249beea9db3b757dbc5709..0725335a581bb8c24c0675cd03b9a1cfa33dc177 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -57,13 +57,13 @@ extern const char *wxDumpFont(const wxFont *font)
     s.Printf(wxS("%s-%s-%s-%d-%d"),
              font->GetFaceName(),
              weight == wxFONTWEIGHT_NORMAL
     s.Printf(wxS("%s-%s-%s-%d-%d"),
              font->GetFaceName(),
              weight == wxFONTWEIGHT_NORMAL

-                ? _T("normal")
+                ? wxT("normal")

                 : weight == wxFONTWEIGHT_BOLD
                 : weight == wxFONTWEIGHT_BOLD

-                    ? _T("bold")
-                    : _T("light"),
+                    ? wxT("bold")
+                    : wxT("light"),

              font->GetStyle() == wxFONTSTYLE_NORMAL
              font->GetStyle() == wxFONTSTYLE_NORMAL

-                ? _T("regular")
-                : _T("italic"),
+                ? wxT("regular")
+                : wxT("italic"),

              font->GetPointSize(),
              font->GetEncoding());
 
              font->GetPointSize(),
              font->GetEncoding());
 


@@ -114,7 +114,7 @@ void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding)
     // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT
     // and, besides, using this value here doesn't make any sense
     wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT,
     // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT
     // and, besides, using this value here doesn't make any sense
     wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT,

-                 _T("can't set default encoding to wxFONTENCODING_DEFAULT") );
+                 wxT("can't set default encoding to wxFONTENCODING_DEFAULT") );

 
     ms_encodingDefault = encoding;
 }
 
     ms_encodingDefault = encoding;
 }


@@ -214,7 +214,7 @@ void wxFontBase::SetPixelSize( const wxSize& pixelSize )
     // NOTE: this algorithm for adjusting the font size is used by all
     //       implementations of wxFont except under wxMSW and wxGTK where
     //       native support to font creation using pixel-size is provided.
     // NOTE: this algorithm for adjusting the font size is used by all
     //       implementations of wxFont except under wxMSW and wxGTK where
     //       native support to font creation using pixel-size is provided.

-    
+

     int largestGood = 0;
     int smallestBad = 0;
 
     int largestGood = 0;
     int smallestBad = 0;
 


@@ -421,24 +421,42 @@ bool wxFontBase::SetFaceName(const wxString& facename)
     return true;
 }
 
     return true;
 }
 

-wxFont wxFont::MakeBold() const
+wxFont& wxFont::MakeBold()
+{
+    SetWeight(wxFONTWEIGHT_BOLD);
+    return *this;
+}
+
+wxFont wxFont::Bold() const

 {
     wxFont font(*this);
 {
     wxFont font(*this);

-    font.SetWeight(wxFONTWEIGHT_BOLD);
+    font.MakeBold();

     return font;
 }
 
     return font;
 }
 

-wxFont wxFont::MakeItalic() const
+wxFont& wxFont::MakeItalic()
+{
+    SetStyle(wxFONTSTYLE_ITALIC);
+    return *this;
+}
+
+wxFont wxFont::Italic() const

 {
     wxFont font(*this);
     font.SetStyle(wxFONTSTYLE_ITALIC);
     return font;
 }
 
 {
     wxFont font(*this);
     font.SetStyle(wxFONTSTYLE_ITALIC);
     return font;
 }
 

-wxFont wxFont::Scale(float x) const
+wxFont& wxFont::Scale(float x)
+{
+    SetPointSize(int(x*GetPointSize() + 0.5));
+    return *this;
+}
+
+wxFont wxFont::Scaled(float x) const

 {
     wxFont font(*this);
 {
     wxFont font(*this);

-    font.SetPointSize(int(x*GetPointSize() + 0.5));
+    font.Scale(x);

     return font;
 }
 
     return font;
 }
 


@@ -480,7 +498,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 {
     long l;
 
 {
     long l;
 

-    wxStringTokenizer tokenizer(s, _T(";"));
+    wxStringTokenizer tokenizer(s, wxT(";"));

 
     wxString token = tokenizer.GetNextToken();
     //
 
     wxString token = tokenizer.GetNextToken();
     //


@@ -531,7 +549,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
 
 {
     wxString s;
 

-    s.Printf(_T("%d;%d;%d;%d;%d;%d;%s;%d"),
+    s.Printf(wxT("%d;%d;%d;%d;%d;%d;%s;%d"),

              0,                                 // version
              pointSize,
              family,
              0,                                 // version
              pointSize,
              family,


@@ -649,7 +667,7 @@ wxString wxNativeFontInfo::ToUserString() const
     switch ( GetWeight() )
     {
         default:
     switch ( GetWeight() )
     {
         default:

-            wxFAIL_MSG( _T("unknown font weight") );
+            wxFAIL_MSG( wxT("unknown font weight") );

             // fall through
 
         case wxFONTWEIGHT_NORMAL:
             // fall through
 
         case wxFONTWEIGHT_NORMAL:


@@ -667,7 +685,7 @@ wxString wxNativeFontInfo::ToUserString() const
     switch ( GetStyle() )
     {
         default:
     switch ( GetStyle() )
     {
         default:

-            wxFAIL_MSG( _T("unknown font style") );
+            wxFAIL_MSG( wxT("unknown font style") );

             // fall through
 
         case wxFONTSTYLE_NORMAL:
             // fall through
 
         case wxFONTSTYLE_NORMAL:


@@ -693,10 +711,10 @@ wxString wxNativeFontInfo::ToUserString() const
             // that the different words which compose this facename are
             // not different adjectives or other data but rather all parts
             // of the facename
             // that the different words which compose this facename are
             // not different adjectives or other data but rather all parts
             // of the facename

-            desc << _T(" '") << face << _("'");
+            desc << wxT(" '") << face << _("'");

         }
         else
         }
         else

-            desc << _T(' ') << face;
+            desc << wxT(' ') << face;

     }
     else // no face name specified
     {
     }
     else // no face name specified
     {


@@ -743,14 +761,14 @@ wxString wxNativeFontInfo::ToUserString() const
     int size = GetPointSize();
     if ( size != wxNORMAL_FONT->GetPointSize() )
     {
     int size = GetPointSize();
     if ( size != wxNORMAL_FONT->GetPointSize() )
     {

-        desc << _T(' ') << size;
+        desc << wxT(' ') << size;

     }
 
 #if wxUSE_FONTMAP
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
     }
 
 #if wxUSE_FONTMAP
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {

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

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


@@ -768,7 +786,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
     wxString toparse(s);
 
     // parse a more or less free form string
     wxString toparse(s);
 
     // parse a more or less free form string

-    wxStringTokenizer tokenizer(toparse, _T(";, "), wxTOKEN_STRTOK);
+    wxStringTokenizer tokenizer(toparse, wxT(";, "), wxTOKEN_STRTOK);

 
     wxString face;
     unsigned long size;
 
     wxString face;
     unsigned long size;


@@ -786,7 +804,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         token.Trim(true).Trim(false).MakeLower();
         if (insideQuotes)
         {
         token.Trim(true).Trim(false).MakeLower();
         if (insideQuotes)
         {

-            if (token.StartsWith("'") || 
+            if (token.StartsWith("'") ||

                 token.EndsWith("'"))
             {
                 insideQuotes = false;
                 token.EndsWith("'"))
             {
                 insideQuotes = false;


@@ -814,21 +832,21 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
             face += " " + token;
             continue;
         }
             face += " " + token;
             continue;
         }

-        if ( token == _T("underlined") || token == _("underlined") )
+        if ( token == wxT("underlined") || token == _("underlined") )

         {
             SetUnderlined(true);
         }
         {
             SetUnderlined(true);
         }

-        else if ( token == _T("light") || token == _("light") )
+        else if ( token == wxT("light") || token == _("light") )

         {
             SetWeight(wxFONTWEIGHT_LIGHT);
             weightfound = true;
         }
         {
             SetWeight(wxFONTWEIGHT_LIGHT);
             weightfound = true;
         }

-        else if ( token == _T("bold") || token == _("bold") )
+        else if ( token == wxT("bold") || token == _("bold") )

         {
             SetWeight(wxFONTWEIGHT_BOLD);
             weightfound = true;
         }
         {
             SetWeight(wxFONTWEIGHT_BOLD);
             weightfound = true;
         }

-        else if ( token == _T("italic") || token == _("italic") )
+        else if ( token == wxT("italic") || token == _("italic") )

         {
             SetStyle(wxFONTSTYLE_ITALIC);
         }
         {
             SetStyle(wxFONTSTYLE_ITALIC);
         }


@@ -855,7 +873,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
                 // assume it is the face name
             if ( !face.empty() )
             {
                 // assume it is the face name
             if ( !face.empty() )
             {

-                face += _T(' ');
+                face += wxT(' ');

             }
 
             face += token;
             }
 
             face += token;


@@ -892,7 +910,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
                     family = wxFONTFAMILY_TELETYPE;
                 else
                     return false;
                     family = wxFONTFAMILY_TELETYPE;
                 else
                     return false;

-                
+

                 SetFamily(family);
             }
             // NB: the check on the facename is implemented in wxFontBase::SetFaceName
                 SetFamily(family);
             }
             // NB: the check on the facename is implemented in wxFontBase::SetFaceName


@@ -956,7 +974,7 @@ wxString wxToString(const wxFontBase& font)
 
 bool wxFromString(const wxString& str, wxFontBase *font)
 {
 
 bool wxFromString(const wxString& str, wxFontBase *font)
 {

-    wxCHECK_MSG( font, false, _T("NULL output parameter") );
+    wxCHECK_MSG( font, false, wxT("NULL output parameter") );

 
     if ( str.empty() )
     {
 
     if ( str.empty() )
     {