wxMSW update for CW, wxMac updated

[wxWidgets.git] / src / generic / dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index bc1b78711d279541166d00574f28a83de206b8bb..bf484f5b9e84406d9bd1cd91dc04010594cbb56d 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1812,7 +1812,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         wxString afmName = wxEmptyString;
         if (!m_printData.GetFontMetricPath().IsEmpty())
         {
-            afmName = m_printData.GetFontMetricPath().fn_str();
+            afmName = m_printData.GetFontMetricPath();
         }
 
         /* 2. open and process the file
@@ -1831,29 +1831,31 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
 
-        afmName << name << ".afm";
-        FILE *afmFile = fopen(afmName,"r");
+        afmName << name << wxT(".afm");
+        FILE *afmFile = wxFopen(afmName,wxT("r"));
         if (afmFile==NULL)
         {
            afmName = wxThePrintSetupData->GetAFMPath();
-           afmName << wxFILE_SEP_PATH << name << ".afm";
-           afmFile = fopen(afmName,"r");
+           afmName << wxFILE_SEP_PATH << name << wxT(".afm");
+           afmFile = wxFopen(afmName,wxT("r"));
         }
 
 #ifdef __UNIX__
-        if (afmFile==NULL)
+#ifndef __VMS__
+       if (afmFile==NULL)
         /* please do NOT change the line above to "else if (afmFile==NULL)" -
            - afmFile = fopen() may fail and in that case the next if branch
            MUST be executed - and it would not if there was "else" */
         {
            afmName = wxINSTALL_PREFIX;
            afmName <<  wxFILE_SEP_PATH
-                   << "share" << wxFILE_SEP_PATH
-                   << "wx" << wxFILE_SEP_PATH
-                   << "afm" << wxFILE_SEP_PATH
-                   << name << ".afm";
-           afmFile = fopen(afmName,"r");
+                   << wxT("share") << wxFILE_SEP_PATH
+                   << wxT("wx") << wxFILE_SEP_PATH
+                   << wxT("afm") << wxFILE_SEP_PATH
+                   << name << wxT(".afm");
+           afmFile = wxFopen(afmName,wxT("r"));
         }
+#endif
 #endif
         
         if (afmFile==NULL)
@@ -1876,54 +1878,54 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
             while(fgets(line,sizeof(line),afmFile)!=NULL)
             {
                 /* A.) check for descender definition */
-                if (wxStrncmp(line,"Descender",9)==0)
+                if (strncmp(line,"Descender",9)==0)
                 {
                     if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
-                            (wxStrcmp(descString,"Descender")!=0))
+                            (strcmp(descString,"Descender")!=0))
                     {
                         wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)\n"), afmName.c_str(),line );
                     }
                 }
                 /* JC 1.) check for UnderlinePosition */
-                else if(wxStrncmp(line,"UnderlinePosition",17)==0)
+                else if(strncmp(line,"UnderlinePosition",17)==0)
                 {
                     if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
-                            (wxStrcmp(upString,"UnderlinePosition")!=0))
+                            (strcmp(upString,"UnderlinePosition")!=0))
                     {
                         wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)\n"), afmName.c_str(), line );
                     }
                 }
                 /* JC 2.) check for UnderlineThickness */
-                else if(wxStrncmp(line,"UnderlineThickness",18)==0)
+                else if(strncmp(line,"UnderlineThickness",18)==0)
                 {
                     if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
-                            (wxStrcmp(utString,"UnderlineThickness")!=0))
+                            (strcmp(utString,"UnderlineThickness")!=0))
                     {
                         wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)\n"), afmName.c_str(), line );
                     }
                 }
                 /* JC 3.) check for EncodingScheme */
-                else if(wxStrncmp(line,"EncodingScheme",14)==0)
+                else if(strncmp(line,"EncodingScheme",14)==0)
                 {
                     if ((sscanf(line,"%s%s",utString,encString)!=2) ||
-                            (wxStrcmp(utString,"EncodingScheme")!=0))
+                            (strcmp(utString,"EncodingScheme")!=0))
                     {
                         wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)\n"), afmName.c_str(), line );
                     }
-                    else if (wxStrncmp(encString, "AdobeStandardEncoding", 21))
+                    else if (strncmp(encString, "AdobeStandardEncoding", 21))
                     {
                         wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"),
                                 afmName.c_str(),line, encString);
                     }
                 }
                 /* B.) check for char-width */
-                else if(wxStrncmp(line,"C ",2)==0)
+                else if(strncmp(line,"C ",2)==0)
                 {
                     if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5)
                     {
                         wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)\n"),afmName.c_str(),line);
                     }
-                    if(wxStrcmp(cString,"C")!=0 || wxStrcmp(semiString,";")!=0 || wxStrcmp(WXString,"WX")!=0)
+                    if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0)
                     {
                         wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error\n"),afmName.c_str(),line);
                     }