some conflicts resolved

[wxWidgets.git] / src / motif / fontenum.cpp

diff --git a/src/motif/fontenum.cpp b/src/motif/fontenum.cpp
index 33c661dfa4719a9c052c39e7d8d5edf709c2d37d..c97a533c5db67a24d13999ee84ee4008f2607f1f 100644 (file)
--- a/src/motif/fontenum.cpp
+++ b/src/motif/fontenum.cpp
@@ -69,7 +69,7 @@ static int CMPFUNC_CONV CompareStrings(const char *s1, const char *s2)
 static char **CreateFontList(wxChar spacing, int *nFonts)
 {
     wxString pattern;
-    pattern.Printf(_T("-*-*-*-*-*-*-*-*-*-*-%c-*-*-*"), spacing);
+    pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-*-*"), spacing);
 
     // get the list of all fonts
     return XListFonts((Display *)wxGetDisplay(), pattern, 32767, nFonts);
@@ -123,7 +123,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
     if ( fixedWidthOnly )
     {
         bool cont = TRUE;
-        fonts = CreateFontList(_T('m'), &nFonts);
+        fonts = CreateFontList(wxT('m'), &nFonts);
         if ( fonts )
         {
             cont = ProcessFamiliesFromFontList(this, fonts, nFonts);
@@ -136,7 +136,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
             return TRUE;
         }
 
-        fonts = CreateFontList(_T('c'), &nFonts);
+        fonts = CreateFontList(wxT('c'), &nFonts);
         if ( !fonts )
         {
             return TRUE;
@@ -144,11 +144,11 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
     }
     else
     {
-        fonts = CreateFontList(_T('*'), &nFonts);
+        fonts = CreateFontList(wxT('*'), &nFonts);
 
         if ( !fonts )
         {
-            wxFAIL_MSG(_T("No fonts at all on this system?"));
+            wxFAIL_MSG(wxT("No fonts at all on this system?"));
 
             return FALSE;
         }
@@ -165,8 +165,8 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 #if 0
     wxString pattern;
-    pattern.Printf(_T("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
-                   family.IsEmpty() ? _T("*") : family.c_str());
+    pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
+                   family.IsEmpty() ? wxT("*") : family.c_str());
 
     // get the list of all fonts
     int nFonts;