Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxINSTALL_PREFIX define to makefile and made dcpsg.cpp use it to

Browse Source 
find the correct location of AFM files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-11-02 12:36:14 +00:00
parent 407f36811e
commit 3e469ea37f
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/defs.h
View File

@@ -805,7 +805,7 @@ enum wxStretch
#else #else
// Under Unix, the dialogs don't have a system menu. Specifying // Under Unix, the dialogs don't have a system menu. Specifying
// wxSYSTEM_MENU here, will make a close button appear. // wxSYSTEM_MENU here, will make a close button appear.
# define wxDEFAULT_DIALOG_STYLE (wxCAPTION) # define wxDEFAULT_DIALOG_STYLE (wxCAPTION|wxTHICK_FRAME)
#endif #endif
/* /*

46
src/generic/dcpsg.cpp
View File

@@ -1809,12 +1809,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
} }
/* get the directory of the AFM files */ /* get the directory of the AFM files */
char afmName[256]; wxString afmName;
afmName[0] = 0;
if (!m_printData.GetFontMetricPath().IsEmpty()) if (!m_printData.GetFontMetricPath().IsEmpty())
{ {
strcpy( afmName, m_printData.GetFontMetricPath().fn_str() ); afmName = m_printData.GetFontMetricPath().fn_str();
} }
/* 2. open and process the file /* 2. open and process the file
@@ -1833,19 +1831,26 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
/* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */ /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
strcat(afmName,name); afmName << name << ".afm";
strcat(afmName,".afm");
FILE *afmFile = fopen(afmName,"r"); FILE *afmFile = fopen(afmName,"r");
if (afmFile==NULL) if (afmFile==NULL)
{ {
strcpy( afmName, wxThePrintSetupData->GetAFMPath() ); afmName = wxThePrintSetupData->GetAFMPath();
strcat(afmName, wxString(wxFILE_SEP_PATH)); afmName << wxFILE_SEP_PATH << name << ".afm";
strcat(afmName,name);
strcat(afmName,".afm");
afmFile = fopen(afmName,"r"); afmFile = fopen(afmName,"r");
} }
#ifdef __UNIX__ #ifdef __UNIX__
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) else if (afmFile==NULL)
{ {
strcpy( afmName, "/usr/local/share/wx/afm/" ); strcpy( afmName, "/usr/local/share/wx/afm/" );
@@ -1861,10 +1866,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
afmFile = fopen(afmName,"r"); afmFile = fopen(afmName,"r");
} }
#endif #endif
#endif
if (afmFile==NULL) if (afmFile==NULL)
{ {
wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName ); wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName.c_str() );
wxLogDebug( wxT(" using approximate values\n")); wxLogDebug( wxT(" using approximate values\n"));
for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */ for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */
lastDescender = -150; /* dito. */ lastDescender = -150; /* dito. */
@@ -1887,7 +1893,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) || if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
(strcmp(descString,"Descender")!=0)) (strcmp(descString,"Descender")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' 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 */ /* JC 1.) check for UnderlinePosition */
@@ -1896,7 +1902,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) || if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
(strcmp(upString,"UnderlinePosition")!=0)) (strcmp(upString,"UnderlinePosition")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' 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 */ /* JC 2.) check for UnderlineThickness */
@@ -1905,7 +1911,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) || if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
(strcmp(utString,"UnderlineThickness")!=0)) (strcmp(utString,"UnderlineThickness")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' 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 */ /* JC 3.) check for EncodingScheme */
@@ -1914,12 +1920,12 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if ((sscanf(line,"%s%s",utString,encString)!=2) || if ((sscanf(line,"%s%s",utString,encString)!=2) ||
(strcmp(utString,"EncodingScheme")!=0)) (strcmp(utString,"EncodingScheme")!=0))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' 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)) else if (strncmp(encString, "AdobeStandardEncoding", 21))
{ {
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"), wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"),
afmName,line, encString); afmName.c_str(),line, encString);
} }
} }
/* B.) check for char-width */ /* B.) check for char-width */
@@ -1927,11 +1933,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
{ {
if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5) 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,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) 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,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); */ /* printf(" char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */
if (ascii>=0 && ascii<256) if (ascii>=0 && ascii<256)
@@ -1941,7 +1947,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
else else
{ {
/* MATTHEW: this happens a lot; don't print an error */ /* 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. */ /* C.) ignore other entries. */

6
src/make.env.in
View File

@@ -20,6 +20,8 @@ TOOLKITDIR = @TOOLKIT_DIR@
WXLIB = @WX_LIBRARY_NAME_STATIC@ WXLIB = @WX_LIBRARY_NAME_STATIC@
WXSHLIB = @WX_LIBRARY_NAME_SHARED@ WXSHLIB = @WX_LIBRARY_NAME_SHARED@
EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\""
########################### VERSION ################################# ########################### VERSION #################################
WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
@@ -56,8 +58,8 @@ SHARED_LD = @SHARED_LD@
########################### Flags ################################# ########################### Flags #################################
CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ $(EXTRADEFS)
CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ $(EXTRADEFS)
PICFLAGS = @PIC_FLAG@ PICFLAGS = @PIC_FLAG@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@