added support for global AFM path setting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index d1a44cfe67db0ad3a2f15e6014a2ce8ce52a0bf3..8125285d8a7672f0b8797adf967e05b7b2e9c445 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/textctrl.h"
 #include "wx/prntbase.h"
 #include "wx/paper.h"

+#include "wx/filefn.h"

 
 #include <math.h>
 
 
 #include <math.h>
 


@@ -1835,17 +1836,24 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         strcat(afmName,name);
         strcat(afmName,".afm");
         FILE *afmFile = fopen(afmName,"r");
         strcat(afmName,name);
         strcat(afmName,".afm");
         FILE *afmFile = fopen(afmName,"r");

+        if (afmFile==NULL)
+        {
+           strcpy( afmName, wxThePrintSetupData->GetAFMPath() );
+           strcat(afmName, wxString(wxFILE_SEP_PATH));
+           strcat(afmName,name);
+           strcat(afmName,".afm");
+           afmFile = fopen(afmName,"r");
+        }

 
 #ifdef __UNIX__
 
 #ifdef __UNIX__

-        if (afmFile==NULL)
+        else if (afmFile==NULL)

         {
             strcpy( afmName, "/usr/local/share/wx/afm/" );
              strcat(afmName,name);
              strcat(afmName,".afm");
              afmFile = fopen(afmName,"r");
         }
         {
             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);
         {
             strcpy( afmName, "/usr/share/wx/afm/" );
             strcat(afmName,name);