Changes to WXDLLEXPORT keyword position for VC++ 6.0; changed
wxTrace to wxDebugLog in memory.cpp and also app.cpp (please check this works on wxGTK!) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -40,101 +40,101 @@ typedef enum {
|
||||
// ----------------------------------------------------------------------------
|
||||
// functions
|
||||
// ----------------------------------------------------------------------------
|
||||
bool WXDLLEXPORT wxFileExists(const wxString& filename);
|
||||
WXDLLEXPORT bool wxFileExists(const wxString& filename);
|
||||
#define FileExists wxFileExists
|
||||
|
||||
// does the path exist? (may have or not '/' or '\\' at the end)
|
||||
bool WXDLLEXPORT wxPathExists(const char *pszPathName);
|
||||
WXDLLEXPORT bool wxPathExists(const char *pszPathName);
|
||||
|
||||
#define wxDirExists wxPathExists
|
||||
#define DirExists wxDirExists
|
||||
|
||||
bool WXDLLEXPORT wxIsAbsolutePath(const wxString& filename);
|
||||
WXDLLEXPORT bool wxIsAbsolutePath(const wxString& filename);
|
||||
#define IsAbsolutePath wxIsAbsolutePath
|
||||
|
||||
// Get filename
|
||||
char* WXDLLEXPORT wxFileNameFromPath(char *path);
|
||||
wxString WXDLLEXPORT wxFileNameFromPath(const wxString& path);
|
||||
WXDLLEXPORT char* wxFileNameFromPath(char *path);
|
||||
WXDLLEXPORT wxString wxFileNameFromPath(const wxString& path);
|
||||
#define FileNameFromPath wxFileNameFromPath
|
||||
|
||||
// Get directory
|
||||
char* WXDLLEXPORT wxPathOnly(char *path);
|
||||
wxString WXDLLEXPORT wxPathOnly(const wxString& path);
|
||||
WXDLLEXPORT char* wxPathOnly(char *path);
|
||||
WXDLLEXPORT wxString wxPathOnly(const wxString& path);
|
||||
#define PathOnly wxPathOnly
|
||||
|
||||
// wxString version
|
||||
wxString WXDLLEXPORT wxRealPath(const wxString& path);
|
||||
WXDLLEXPORT wxString wxRealPath(const wxString& path);
|
||||
|
||||
void WXDLLEXPORT wxDos2UnixFilename(char *s);
|
||||
WXDLLEXPORT void wxDos2UnixFilename(char *s);
|
||||
#define Dos2UnixFilename wxDos2UnixFilename
|
||||
|
||||
void WXDLLEXPORT wxUnix2DosFilename(char *s);
|
||||
WXDLLEXPORT void wxUnix2DosFilename(char *s);
|
||||
#define Unix2DosFilename wxUnix2DosFilename
|
||||
|
||||
// Strip the extension, in situ
|
||||
void WXDLLEXPORT wxStripExtension(char *buffer);
|
||||
void WXDLLEXPORT wxStripExtension(wxString& buffer);
|
||||
WXDLLEXPORT void wxStripExtension(char *buffer);
|
||||
WXDLLEXPORT void wxStripExtension(wxString& buffer);
|
||||
|
||||
// Get a temporary filename, opening and closing the file.
|
||||
char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = (char *) NULL);
|
||||
WXDLLEXPORT char* wxGetTempFileName(const wxString& prefix, char *buf = (char *) NULL);
|
||||
|
||||
// Expand file name (~/ and ${OPENWINHOME}/ stuff)
|
||||
char* WXDLLEXPORT wxExpandPath(char *dest, const char *path);
|
||||
WXDLLEXPORT char* wxExpandPath(char *dest, const char *path);
|
||||
|
||||
// Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
|
||||
// and make (if under the home tree) relative to home
|
||||
// [caller must copy-- volatile]
|
||||
char* WXDLLEXPORT wxContractPath (const wxString& filename,
|
||||
WXDLLEXPORT char* wxContractPath (const wxString& filename,
|
||||
const wxString& envname = "", const wxString& user = "");
|
||||
|
||||
// Destructive removal of /./ and /../ stuff
|
||||
char* WXDLLEXPORT wxRealPath(char *path);
|
||||
WXDLLEXPORT char* wxRealPath(char *path);
|
||||
|
||||
// Allocate a copy of the full absolute path
|
||||
char* WXDLLEXPORT wxCopyAbsolutePath(const wxString& path);
|
||||
WXDLLEXPORT char* wxCopyAbsolutePath(const wxString& path);
|
||||
|
||||
// Get first file name matching given wild card.
|
||||
// Flags are reserved for future use.
|
||||
#define wxFILE 1
|
||||
#define wxDIR 2
|
||||
char* WXDLLEXPORT wxFindFirstFile(const char *spec, int flags = wxFILE);
|
||||
char* WXDLLEXPORT wxFindNextFile(void);
|
||||
WXDLLEXPORT char* wxFindFirstFile(const char *spec, int flags = wxFILE);
|
||||
WXDLLEXPORT char* wxFindNextFile(void);
|
||||
|
||||
// Does the pattern contain wildcards?
|
||||
bool WXDLLEXPORT wxIsWild(const wxString& pattern);
|
||||
WXDLLEXPORT bool wxIsWild(const wxString& pattern);
|
||||
|
||||
// Does the pattern match the text (usually a filename)?
|
||||
// If dot_special is TRUE, doesn't match * against . (eliminating
|
||||
// `hidden' dot files)
|
||||
bool WXDLLEXPORT wxMatchWild(const wxString& pattern, const wxString& text, bool dot_special = TRUE);
|
||||
WXDLLEXPORT bool wxMatchWild(const wxString& pattern, const wxString& text, bool dot_special = TRUE);
|
||||
|
||||
// Concatenate two files to form third
|
||||
bool WXDLLEXPORT wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);
|
||||
WXDLLEXPORT bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);
|
||||
|
||||
// Copy file1 to file2
|
||||
bool WXDLLEXPORT wxCopyFile(const wxString& file1, const wxString& file2);
|
||||
WXDLLEXPORT bool wxCopyFile(const wxString& file1, const wxString& file2);
|
||||
|
||||
// Remove file
|
||||
bool WXDLLEXPORT wxRemoveFile(const wxString& file);
|
||||
WXDLLEXPORT bool wxRemoveFile(const wxString& file);
|
||||
|
||||
// Rename file
|
||||
bool WXDLLEXPORT wxRenameFile(const wxString& file1, const wxString& file2);
|
||||
WXDLLEXPORT bool wxRenameFile(const wxString& file1, const wxString& file2);
|
||||
|
||||
// Get current working directory.
|
||||
// If buf is NULL, allocates space using new, else
|
||||
// copies into buf.
|
||||
// IMPORTANT NOTE getcwd is know not to work under some releases
|
||||
// of Win32s 1.3, according to MS release notes!
|
||||
char* WXDLLEXPORT wxGetWorkingDirectory(char *buf = (char *) NULL, int sz = 1000);
|
||||
WXDLLEXPORT char* wxGetWorkingDirectory(char *buf = (char *) NULL, int sz = 1000);
|
||||
|
||||
// Set working directory
|
||||
bool WXDLLEXPORT wxSetWorkingDirectory(const wxString& d);
|
||||
WXDLLEXPORT bool wxSetWorkingDirectory(const wxString& d);
|
||||
|
||||
// Make directory
|
||||
bool WXDLLEXPORT wxMkdir(const wxString& dir);
|
||||
WXDLLEXPORT bool wxMkdir(const wxString& dir);
|
||||
|
||||
// Remove directory. Flags reserved for future use.
|
||||
bool WXDLLEXPORT wxRmdir(const wxString& dir, int flags = 0);
|
||||
WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
|
||||
|
||||
// separators in file names
|
||||
#define FILE_SEP_EXT '.'
|
||||
@@ -169,17 +169,17 @@ inline bool wxIsPathSeparator(char c)
|
||||
{ return c == FILE_SEP_PATH_DOS || c == FILE_SEP_PATH_UNIX; }
|
||||
|
||||
// does the string ends with path separator?
|
||||
bool WXDLLEXPORT wxEndsWithPathSeparator(const char *pszFileName);
|
||||
WXDLLEXPORT bool wxEndsWithPathSeparator(const char *pszFileName);
|
||||
|
||||
// split the full path into path (including drive for DOS), name and extension
|
||||
// (understands both '/' and '\\')
|
||||
void WXDLLEXPORT wxSplitPath(const char *pszFileName,
|
||||
WXDLLEXPORT void wxSplitPath(const char *pszFileName,
|
||||
wxString *pstrPath,
|
||||
wxString *pstrName,
|
||||
wxString *pstrExt);
|
||||
|
||||
// find a file in a list of directories, returns false if not found
|
||||
bool WXDLLEXPORT wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile);
|
||||
WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// classes
|
||||
|
Reference in New Issue
Block a user