Put gridg.h back so that it gets installed

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index c27134680f81880480b1c48b9fe5b957f0f7c0a8..72348fda2c41a01106ceff5aae2a082580a8115a 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -162,18 +162,18 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     wxString tmp;
 
     wxString fontname( 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();
 
     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;

 
     tmp = tn.GetNextToken().MakeUpper();
 
     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();                           // ?
 
     tn.GetNextToken();                           // set width
     tn.GetNextToken();                           // ?


@@ -187,12 +187,12 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     tn.GetNextToken();                           // y-res
 
     tmp = tn.GetNextToken().MakeUpper();
     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,
 }
 
 bool wxFont::Create( int pointSize,


@@ -235,42 +235,42 @@ wxFont::~wxFont()
 
 int wxFont::GetPointSize() const
 {
 
 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
 {
 
     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
 {
 
     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
 {
 
     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
 {
 
     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
 {
 
     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;
 }
 
     return M_FONTDATA->m_underlined;
 }


@@ -278,7 +278,7 @@ bool wxFont::GetUnderlined() const
 
 wxFontEncoding wxFont::GetEncoding() 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;
 }
 
     return M_FONTDATA->m_encoding;
 }


@@ -344,7 +344,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     if (!Ok())
     {
 {
     if (!Ok())
     {

-        wxFAIL_MSG( T("invalid font") );
+        wxFAIL_MSG( wxT("invalid font") );

 
         return (GdkFont*) NULL;
     }
 
         return (GdkFont*) NULL;
     }


@@ -387,7 +387,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 
     if (!font)
     {
 
     if (!font)
     {

-        wxLogError(T("could not load any font"));
+        wxLogError(wxT("could not load any font"));

     }
 
     return font;
     }
 
     return font;