wxMotif compiles (and runs minimal sample) again after wxMenu changes

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 2206e14df673219876f2fa8b416e438c7eae9b0d..1f2153f36c013db4ea73b395cf7adb331c408219 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -46,6 +46,7 @@
 #include "wx/textctrl.h"
 #include "wx/prntbase.h"
 #include "wx/paper.h"
+#include "wx/filefn.h"
 
 #include <math.h>
 
@@ -1808,12 +1809,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         }
 
         /* get the directory of the AFM files */
-        char afmName[256];
-        afmName[0] = 0;
-
+        wxString afmName;
         if (!m_printData.GetFontMetricPath().IsEmpty())
         {
-            strcpy( afmName, m_printData.GetFontMetricPath().fn_str() );
+            afmName = m_printData.GetFontMetricPath().fn_str();
         }
 
         /* 2. open and process the file
@@ -1832,20 +1831,34 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
 
-        strcat(afmName,name);
-        strcat(afmName,".afm");
+        afmName << name << ".afm";
         FILE *afmFile = fopen(afmName,"r");
+        if (afmFile==NULL)
+        {
+           afmName = wxThePrintSetupData->GetAFMPath();
+           afmName << wxFILE_SEP_PATH << name << ".afm";
+           afmFile = fopen(afmName,"r");
+        }
 
 #ifdef __UNIX__
-        if (afmFile==NULL)
+        else if (afmFile==NULL)
+        {
+           afmName = wxINSTALL_PREFIX;
+           afmName <<  wxFILE_SEP_PATH
+                   << "afm" << wxFILE_SEP_PATH
+                   << name << ".afm";
+           afmFile = fopen(afmName,"r");
+        }
+
+#if 0        
+        else if (afmFile==NULL)
         {
             strcpy( afmName, "/usr/local/share/wx/afm/" );
              strcat(afmName,name);
              strcat(afmName,".afm");
              afmFile = fopen(afmName,"r");
         }
-
-        if (afmFile==NULL)
+        else if (afmFile==NULL)
         {
             strcpy( afmName, "/usr/share/wx/afm/" );
             strcat(afmName,name);
@@ -1853,11 +1866,12 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
             afmFile = fopen(afmName,"r");
         }
 #endif
-
+#endif
+        
         if (afmFile==NULL)
         {
-            wxLogDebug( "GetTextExtent: can't open AFM file '%s'\n", afmName );
-            wxLogDebug( "               using approximate values\n");
+            wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName.c_str() );
+            wxLogDebug( wxT("               using approximate values\n"));
             for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */
             lastDescender = -150; /* dito. */
         }
@@ -1879,7 +1893,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
                             (strcmp(descString,"Descender")!=0))
                     {
-                        wxLogDebug( "AFM-file '%s': line '%s' has error (bad descender)\n", afmName,line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)\n"), afmName.c_str(),line );
                     }
                 }
                 /* JC 1.) check for UnderlinePosition */
@@ -1888,7 +1902,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
                             (strcmp(upString,"UnderlinePosition")!=0))
                     {
-                        wxLogDebug( "AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n", afmName, line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)\n"), afmName.c_str(), line );
                     }
                 }
                 /* JC 2.) check for UnderlineThickness */
@@ -1897,7 +1911,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
                             (strcmp(utString,"UnderlineThickness")!=0))
                     {
-                        wxLogDebug( "AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n", afmName, line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)\n"), afmName.c_str(), line );
                     }
                 }
                 /* JC 3.) check for EncodingScheme */
@@ -1906,12 +1920,12 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%s",utString,encString)!=2) ||
                             (strcmp(utString,"EncodingScheme")!=0))
                     {
-                        wxLogDebug("AFM-file '%s': line '%s' has error (bad EncodingScheme)\n", afmName, line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)\n"), afmName.c_str(), line );
                     }
                     else if (strncmp(encString, "AdobeStandardEncoding", 21))
                     {
-                        wxLogDebug( "AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)\n",
-                                afmName,line, encString);
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"),
+                                afmName.c_str(),line, encString);
                     }
                 }
                 /* B.) check for char-width */
@@ -1919,11 +1933,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                 {
                     if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5)
                     {
-                        wxLogDebug("AFM-file '%s': line '%s' has an error (bad character width)\n",afmName,line);
+                        wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)\n"),afmName.c_str(),line);
                     }
                     if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0)
                     {
-                        wxLogDebug("AFM-file '%s': line '%s' has a format error\n",afmName,line);
+                        wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error\n"),afmName.c_str(),line);
                     }
                     /* printf("            char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */
                     if (ascii>=0 && ascii<256)
@@ -1933,7 +1947,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     else
                     {
                         /* MATTHEW: this happens a lot; don't print an error */
-                        /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName,ascii); */
+                        /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName.c_str(),ascii); */
                     }
                 }
                 /* C.) ignore other entries. */
@@ -1970,11 +1984,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     double widthSum=0;
     wxCoord height=Size; /* by default */
     unsigned char *p;
-    for(p=(unsigned char *)strbuf; *p; p++)
+    for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)
     {
         if(lastWidths[*p]== INT_MIN)
         {
-            wxLogDebug("GetTextExtent: undefined width for character '%c' (%d)\n", *p,*p);
+            wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)\n"), *p,*p);
             widthSum += /*(wxCoord)*/(lastWidths[' ']/1000.0F * Size); /* assume space */
         }
         else