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

Split this out from other changes to keep things sane..

Browse Source 
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-13 05:17:41 +00:00
parent 5797172366
commit b1d4dd7add
59 changed files with 1099 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/common/filefn.cpp
View File

@@ -260,9 +260,9 @@ void wxPathList::EnsureFileAccessible (const wxString& path)
bool wxPathList::Member (const wxString& path)
{
for (wxNode * node = First (); node != NULL; node = node->Next ())
for (wxStringList::Node *node = GetFirst(); node; node = node->GetNext())
{
wxString path2((wxChar *) node->Data ());
wxString path2( node->GetData() );
if (
#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
// Case INDEPENDENT
@@ -272,9 +272,9 @@ bool wxPathList::Member (const wxString& path)
path.CompareTo (path2) == 0
#endif
)
return TRUE;
return true;
}
return FALSE;
return false;
}
wxString wxPathList::FindValidPath (const wxString& file)
@@ -288,9 +288,9 @@ wxString wxPathList::FindValidPath (const wxString& file)
wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
for (wxNode * node = First (); node; node = node->Next ())
for (wxStringList::Node *node = GetFirst(); node; node = node->GetNext())
{
wxChar *path = (wxChar *) node->Data ();
wxChar *path = node->GetData();
wxStrcpy (wxFileFunctionsBuffer, path);
wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
if (ch != wxT('\\') && ch != wxT('/'))
@@ -305,7 +305,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
}
} // for()
return wxString(wxT("")); // Not found
return wxEmptyString; // Not found
}
wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
@@ -354,23 +354,23 @@ wxIsAbsolutePath (const wxString& filename)
// "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
// is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
return TRUE ;
return true ;
#else
// Unix like or Windows
if (filename[0] == wxT('/'))
return TRUE;
return true;
#endif
#ifdef __VMS__
if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
return TRUE;
return true;
#endif
#ifdef __WINDOWS__
// MSDOS like
if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
return TRUE;
return true;
#endif
}
return FALSE ;
return false ;
}
/*
@@ -549,7 +549,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
s = nm;
d = lnm;
#ifdef __WXMSW__
q = FALSE;
q = false;
#else
q = nm[0] == wxT('\\') && nm[1] == wxT('~');
#endif
@@ -865,8 +865,8 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
int j;
OSErr theErr;
OSStatus theStatus;
Boolean isDirectory = false;
Str255 theParentPath = "\p";
Boolean isDirectory = false;
Str255 theParentPath = "\p";
FSSpec theParentSpec;
FSRef theParentRef;
char theFileName[FILENAME_MAX];
@@ -944,7 +944,7 @@ static char sMacFileNameConversion[ 1000 ] ;
#endif
void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
{
OSStatus err = noErr ;
OSStatus err = noErr ;
#ifdef __DARWIN__
FSRef theRef;
@@ -953,9 +953,9 @@ void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
// convert the FSRef to an FSSpec
err = FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
#else
if ( strchr( path , ':' ) == NULL )
if ( strchr( path , ':' ) == NULL )
{
// try whether it is a volume / or a mounted volume
// try whether it is a volume / or a mounted volume
strncpy( sMacFileNameConversion , path , 1000 ) ;
sMacFileNameConversion[998] = 0 ;
strcat( sMacFileNameConversion , ":" ) ;
@@ -963,7 +963,7 @@ void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
}
else
{
err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
}
#endif
}
@@ -1088,7 +1088,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
{
wxString outfile;
if ( !wxGetTempFileName( wxT("cat"), outfile) )
return FALSE;
return false;
FILE *fp1 = (FILE *) NULL;
FILE *fp2 = (FILE *) NULL;
@@ -1104,7 +1104,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
fclose (fp2);
if (fp3)
fclose (fp3);
return FALSE;
return false;
}
int ch;
@@ -1135,11 +1135,11 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
file1.c_str(), file2.c_str());
return FALSE;
return false;
}
#elif defined(__WXPM__)
if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
return FALSE;
return false;
#else // !Win32
wxStructStat fbuf;
@@ -1150,13 +1150,13 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
// from it anyhow
wxLogSysError(_("Impossible to get permissions for file '%s'"),
file1.c_str());
return FALSE;
return false;
}
// open file1 for reading
wxFile fileIn(file1, wxFile::read);
if ( !fileIn.IsOpened() )
return FALSE;
return false;
// remove file2, if it exists. This is needed for creating
// file2 with the correct permissions in the next step
@@ -1164,7 +1164,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{
wxLogSysError(_("Impossible to overwrite the file '%s'"),
file2.c_str());
return FALSE;
return false;
}
#ifdef __UNIX__
@@ -1178,7 +1178,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
wxFile fileOut;
if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
return FALSE;
return false;
#ifdef __UNIX__
/// restore the old umask
@@ -1192,21 +1192,21 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{
count = fileIn.Read(buf, WXSIZEOF(buf));
if ( fileIn.Error() )
return FALSE;
return false;
// end of file?
if ( !count )
break;
if ( fileOut.Write(buf, count) < count )
return FALSE;
return false;
}
// we can expect fileIn to be closed successfully, but we should ensure
// that fileOut was closed as some write errors (disk full) might not be
// detected before doing this
if ( !fileIn.Close() || !fileOut.Close() )
return FALSE;
return false;
#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
// no chmod in VA. Should be some permission API for HPFS386 partitions
@@ -1215,12 +1215,12 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{
wxLogSysError(_("Impossible to set permissions for the file '%s'"),
file2.c_str());
return FALSE;
return false;
}
#endif // OS/2 || Mac
#endif // __WXMSW__ && __WIN32__
return TRUE;
return true;
}
bool
@@ -1228,15 +1228,15 @@ wxRenameFile (const wxString& file1, const wxString& file2)
{
// Normal system call
if ( wxRename (file1, file2) == 0 )
return TRUE;
return true;
// Try to copy
if (wxCopyFile(file1, file2)) {
wxRemoveFile(file1);
return TRUE;
return true;
}
// Give up
return FALSE;
return false;
}
bool wxRemoveFile(const wxString& file)
@@ -1282,23 +1282,23 @@ bool wxMkdir(const wxString& dir, int perm)
{
wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
return FALSE;
return false;
}
return TRUE;
return true;
#endif // Mac/!Mac
}
bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
{
#ifdef __VMS__
return FALSE; //to be changed since rmdir exists in VMS7.x
return false; //to be changed since rmdir exists in VMS7.x
#elif defined(__WXPM__)
return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
#else
#ifdef __SALFORDC__
return FALSE; // What to do?
return false; // What to do?
#else
return (wxRmDir(OS_FILENAME(dir)) == 0);
#endif
@@ -1434,14 +1434,14 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
buf = new wxChar[sz + 1];
}
bool ok = FALSE;
bool ok = false;
// for the compilers which have Unicode version of _getcwd(), call it
// directly, for the others call the ANSI version and do the translation
#if !wxUSE_UNICODE
#define cbuf buf
#else // wxUSE_UNICODE
bool needsANSI = TRUE;
bool needsANSI = true;
#if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
// This is not legal code as the compiler
@@ -1455,11 +1455,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
#if wxUSE_UNICODE_MSLU
if ( wxGetOsVersion() != wxWIN95 )
#else
char *cbuf = NULL; // never really used because needsANSI will always be FALSE
char *cbuf = NULL; // never really used because needsANSI will always be false
#endif
{
ok = _wgetcwd(buf, sz) != NULL;
needsANSI = FALSE;
needsANSI = false;
}
#endif
@@ -1488,11 +1488,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
strcpy( cbuf , res ) ;
cbuf[res.length()]=0 ;
ok = TRUE;
ok = true;
}
else
{
ok = FALSE;
ok = false;
}
#elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
APIRET rc;
@@ -1620,7 +1620,7 @@ bool wxEndsWithPathSeparator(const wxChar *pszFileName)
bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
{
// we assume that it's not empty
wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
wxCHECK_MSG( !wxIsEmpty(pszFile), false,
_T("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
@@ -1691,13 +1691,13 @@ bool wxIsWild( const wxString& pattern )
switch (*pat++)
{
case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
return TRUE;
return true;
case wxT('\\'):
if (!*pat++)
return FALSE;
return false;
}
}
return FALSE;
return false;
}
/*
@@ -1729,7 +1729,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
{
/* Never match so that hidden Unix files
* are never found. */
return FALSE;
return false;
}
for (;;)
@@ -1746,7 +1746,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
{
m++;
if (!*n++)
return FALSE;
return false;
}
else
{
@@ -1755,7 +1755,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
m++;
/* Quoting "nothing" is a bad thing */
if (!*m)
return FALSE;
return false;
}
if (!*m)
{
@@ -1765,9 +1765,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
* match
*/
if (!*n)
return TRUE;
return true;
if (just)
return TRUE;
return true;
just = 0;
goto not_matched;
}
@@ -1799,7 +1799,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
* impossible to match it
*/
if (!*n)
return FALSE;
return false;
if (mp)
{
m = mp;
@@ -1821,7 +1821,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
count = acount;
}
else
return FALSE;
return false;
}
}
}