AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More replacements of strcmp -> wxStr..

Browse Source 
Minor change in font code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-11-07 16:08:25 +00:00
parent 8493118f58
commit 81c67e27fd
6 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/filefn.cpp
View File

@ -81,8 +81,6 @@
#ifndef __TWIN32__
#include <sys/unistd.h>
#endif
#define stricmp strcasecmp
#endif
#ifdef __BORLANDC__ // Please someone tell me which version of Borland needs

4
src/common/intl.cpp
View File

@ -423,7 +423,7 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
if ( nStr == 0 )
return NULL;
if ( strcmp(szOrig, StringAtOfs(m_pOrigTable, nStr - 1)) == 0 )
if ( wxStrcmp(szOrig, StringAtOfs(m_pOrigTable, nStr - 1)) == 0 )
return StringAtOfs(m_pTransTable, nStr - 1);
if ( nIndex >= m_nHashSize - nIncr)
@ -438,7 +438,7 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
current;
while ( bottom < top ) {
current = (bottom + top) / 2;
int res = strcmp(szOrig, StringAtOfs(m_pOrigTable, current));
int res = wxStrcmp(szOrig, StringAtOfs(m_pOrigTable, current));
if ( res < 0 )
top = current;
else if ( res > 0 )

2
src/common/object.cpp
View File

@ -205,7 +205,7 @@ bool wxClassInfo::IsKindOf(wxClassInfo *info) const
// PROBABLY NO LONGER TRUE now I've done DLL creation right.
/*
#if WXMAKINGDLL
if (GetClassName() && info->GetClassName() && (strcmp(GetClassName(), info->GetClassName()) == 0))
if (GetClassName() && info->GetClassName() && (wxStrcmp(GetClassName(), info->GetClassName()) == 0))
return TRUE;
#else
*/

2
src/common/utilscmn.cpp
View File

@ -151,7 +151,7 @@ int strcasecmp(const char *str_1, const char *str_2)
myLowerString(temp1);
myLowerString(temp2);
int result = strcmp(temp1,temp2);
int result = wxStrcmp(temp1,temp2);
delete[] temp1;
delete[] temp2;

22
src/generic/dcpsg.cpp
View File

@ -1876,54 +1876,54 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
while(fgets(line,sizeof(line),afmFile)!=NULL)
{
/* A.) check for descender definition */
if (strncmp(line,"Descender",9)==0)
if (wxStrncmp(line,"Descender",9)==0)
{
if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
(strcmp(descString,"Descender")!=0))
(wxStrcmp(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(strncmp(line,"UnderlinePosition",17)==0)
else if(wxStrncmp(line,"UnderlinePosition",17)==0)
{
if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
(strcmp(upString,"UnderlinePosition")!=0))
(wxStrcmp(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(strncmp(line,"UnderlineThickness",18)==0)
else if(wxStrncmp(line,"UnderlineThickness",18)==0)
{
if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
(strcmp(utString,"UnderlineThickness")!=0))
(wxStrcmp(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(strncmp(line,"EncodingScheme",14)==0)
else if(wxStrncmp(line,"EncodingScheme",14)==0)
{
if ((sscanf(line,"%s%s",utString,encString)!=2) ||
(strcmp(utString,"EncodingScheme")!=0))
(wxStrcmp(utString,"EncodingScheme")!=0))
{
wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)\n"), afmName.c_str(), line );
}
else if (strncmp(encString, "AdobeStandardEncoding", 21))
else if (wxStrncmp(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(strncmp(line,"C ",2)==0)
else if(wxStrncmp(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(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0)
if(wxStrcmp(cString,"C")!=0 || wxStrcmp(semiString,";")!=0 || wxStrcmp(WXString,"WX")!=0)
{
wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error\n"),afmName.c_str(),line);
}

35
src/unix/fontutil.cpp
View File

@ -184,7 +184,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
case wxFONTENCODING_SYSTEM:
info->xregistry =
info->xencoding = wxT('*');
info->xencoding = wxT("*");
break;
default:
@ -222,20 +222,29 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
// encoding, it's useless to do all other approximations (i.e. size,
// family &c don't matter much)
wxNativeEncodingInfo info;
if ( !wxGetNativeFontEncoding(encoding, &info) ||
!wxTestFontEncoding(info) )
if (encoding == wxFONTENCODING_SYSTEM)
{
if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
{
// unspported encoding - replace it with the default
//
// NB: we can't just return 0 from here because wxGTK code doesn't
// check for it (i.e. it supposes that we'll always succeed),
// so it would provoke a crash
wxGetNativeFontEncoding(wxFONTENCODING_SYSTEM, &info);
}
// This will always work so we don't test to save time
wxGetNativeFontEncoding(wxFONTENCODING_SYSTEM, &info);
}
//else: we have the correct xregistry/xencoding in info structure
else
{
if ( !wxGetNativeFontEncoding(encoding, &info) ||
!wxTestFontEncoding(info) )
{
if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
{
// unspported encoding - replace it with the default
//
// NB: we can't just return 0 from here because wxGTK code doesn't
// check for it (i.e. it supposes that we'll always succeed),
// so it would provoke a crash
wxGetNativeFontEncoding(wxFONTENCODING_SYSTEM, &info);
}
}
}
// OK, we have the correct xregistry/xencoding in info structure
wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight,
underlined, facename,