Someone forgot wxT()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 738981520bc338ea0529bd0a15e348d70a315b1c..97c51a8968d751686a76dc3230fc23a6bcf961f3 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -217,7 +217,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     if ( registry == _T("ISO8859") )
     {
         int cp;
     if ( registry == _T("ISO8859") )
     {
         int cp;

-        if ( wxSscanf(encoding, "%d", &cp) == 1 )
+        if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )

         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);


@@ -226,7 +226,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     else if ( registry == _T("MICROSOFT") )
     {
         int cp;
     else if ( registry == _T("MICROSOFT") )
     {
         int cp;

-        if ( wxSscanf(encoding, "cp125%d", &cp) == 1 )
+        if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )

         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 738981520bc338ea0529bd0a15e348d70a315b1c..97c51a8968d751686a76dc3230fc23a6bcf961f3 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -217,7 +217,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     if ( registry == _T("ISO8859") )
     {
         int cp;
     if ( registry == _T("ISO8859") )
     {
         int cp;

-        if ( wxSscanf(encoding, "%d", &cp) == 1 )
+        if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )

         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);


@@ -226,7 +226,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     else if ( registry == _T("MICROSOFT") )
     {
         int cp;
     else if ( registry == _T("MICROSOFT") )
     {
         int cp;

-        if ( wxSscanf(encoding, "cp125%d", &cp) == 1 )
+        if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )

         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);