Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv12508/src/gui

Modified Files:
        wxMApp.cpp wxlparser.cpp 
Log Message:
changed wxTheFontMapper to wxFontMapper::Get()

Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -b -u -2 -r1.231 -r1.232
--- wxMApp.cpp  15 Apr 2002 23:45:13 -0000      1.231
+++ wxMApp.cpp  16 Apr 2002 02:50:38 -0000      1.232
@@ -2166,9 +2166,9 @@
    CHECK( enc, false, "CheckEncodingAvailability: NULL encoding" );
 
-   if ( !wxTheFontMapper->IsEncodingAvailable(*enc) )
+   if ( !wxFontMapper::Get()->IsEncodingAvailable(*enc) )
    {
       // try to find another encoding
       wxFontEncoding encAlt;
-      if ( wxTheFontMapper->GetAltForEncoding(*enc, &encAlt, "", mayAskUser) )
+      if ( wxFontMapper::Get()->GetAltForEncoding(*enc, &encAlt, "", mayAskUser) )
       {
          // translate the text (if any) to the equivalent encoding

Index: wxlparser.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlparser.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -b -u -2 -r1.48 -r1.49
--- wxlparser.cpp       16 Apr 2002 02:45:53 -0000      1.48
+++ wxlparser.cpp       16 Apr 2002 02:50:38 -0000      1.49
@@ -52,9 +52,9 @@
    if ( encoding != wxFONTENCODING_SYSTEM )
    {
-      if ( !wxTheFontMapper->IsEncodingAvailable(encoding) )
+      if ( !wxFontMapper::Get()->IsEncodingAvailable(encoding) )
       {
          // try to find another encoding
          wxFontEncoding encAlt;
-         if ( wxTheFontMapper->GetAltForEncoding(encoding, &encAlt) )
+         if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &encAlt) )
          {
             if ( conv->Init(encoding, encAlt) )


_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to