X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35c265988485487c24c341fd270bd3faac4f6eb..12db77cab1054d288a2b3e2d07e58ad1d6386a53:/src/gtk1/font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 958d7db270..0457bda88e 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -150,7 +150,7 @@ void wxFont::Init()
         wxTheFontList->Append( this );
 }
 
-wxFont::wxFont( GdkFont *font, char *xFontName )
+wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
 {
     if (!xFontName)
         return;
@@ -162,18 +162,25 @@ wxFont::wxFont( GdkFont *font, char *xFontName )
     wxString tmp;
 
     wxString fontname( xFontName );
-    wxStringTokenizer tn( fontname, _T("-") );
+    wxStringTokenizer tn( fontname, wxT("-") );
 
     tn.GetNextToken();                           // foundry
 
     M_FONTDATA->m_faceName = tn.GetNextToken();  // courier
 
     tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("BOLD")) M_FONTDATA->m_weight = wxBOLD;
-
+    if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+    
     tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == _T("O")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
 
     tn.GetNextToken();                           // set width
     tn.GetNextToken();                           // ?
@@ -187,12 +194,12 @@ wxFont::wxFont( GdkFont *font, char *xFontName )
     tn.GetNextToken();                           // y-res
 
     tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("M")) M_FONTDATA->m_family = wxMODERN;
-    else if (M_FONTDATA->m_faceName == _T("TIMES")) M_FONTDATA->m_family = wxROMAN;
-    else if (M_FONTDATA->m_faceName == _T("HELVETICA")) M_FONTDATA->m_family = wxSWISS;
-    else if (M_FONTDATA->m_faceName == _T("LUCIDATYPEWRITER")) M_FONTDATA->m_family = wxTELETYPE;
-    else if (M_FONTDATA->m_faceName == _T("LUCIDA")) M_FONTDATA->m_family = wxDECORATIVE;
-    else if (M_FONTDATA->m_faceName == _T("UTOPIA")) M_FONTDATA->m_family = wxSCRIPT;
+    if (tmp == wxT("M")) M_FONTDATA->m_family = wxMODERN;
+    else if (M_FONTDATA->m_faceName == wxT("TIMES")) M_FONTDATA->m_family = wxROMAN;
+    else if (M_FONTDATA->m_faceName == wxT("HELVETICA")) M_FONTDATA->m_family = wxSWISS;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER")) M_FONTDATA->m_family = wxTELETYPE;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDA")) M_FONTDATA->m_family = wxDECORATIVE;
+    else if (M_FONTDATA->m_faceName == wxT("UTOPIA")) M_FONTDATA->m_family = wxSCRIPT;
 }
 
 bool wxFont::Create( int pointSize,
@@ -235,42 +242,42 @@ wxFont::~wxFont()
 
 int wxFont::GetPointSize() const
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), _T(""), _T("invalid font") );
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( Ok(), FALSE, _T("invalid font") );
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
     return M_FONTDATA->m_underlined;
 }
@@ -278,7 +285,7 @@ bool wxFont::GetUnderlined() const
 
 wxFontEncoding wxFont::GetEncoding() const
 {
-    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, _T("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
     return M_FONTDATA->m_encoding;
 }
@@ -344,7 +351,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     if (!Ok())
     {
-        wxFAIL_MSG( _T("invalid font") );
+        wxFAIL_MSG( wxT("invalid font") );
 
         return (GdkFont*) NULL;
     }
@@ -387,7 +394,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 
     if (!font)
     {
-        wxLogError(_T("could not load any font"));
+        wxLogError(wxT("could not load any font"));
     }
 
     return font;