cleanup

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 88f9add4233dbe7c6b0dc8d5c7d623d7b5b3371a..c1c8cb1e80cee56e0af4770146a0576869b29ef0 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -140,7 +140,7 @@ private:
     bool m_flagOld;
     bool& m_flag;
 
     bool m_flagOld;
     bool& m_flag;
 

-    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
+    wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -329,7 +329,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
              encName = GetEncodingName(encoding);
     if ( !facename.empty() )
     {
              encName = GetEncodingName(encoding);
     if ( !facename.empty() )
     {

-        configEntry = facename + _T("_");
+        configEntry = facename + wxT("_");

     }
     configEntry += encName;
 
     }
     configEntry += encName;
 


@@ -494,7 +494,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      bool interactive)
 {
     wxCHECK_MSG( encodingAlt, false,
                                      bool interactive)
 {
     wxCHECK_MSG( encodingAlt, false,

-                    _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
+                    wxT("wxFontEncoding::GetAltForEncoding(): NULL pointer") );

 
     wxNativeEncodingInfo info;
     if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
 
     wxNativeEncodingInfo info;
     if ( !GetAltForEncoding(encoding, &info, facename, interactive) )