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

Insure suitable choices of path/drive separator on OS/2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-11-23 22:09:14 +00:00
parent 670f094332
commit 712a3384f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/filefn.h
View File

@@ -280,7 +280,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
#define wxPATH_SEP_MAC wxT(";") #define wxPATH_SEP_MAC wxT(";")
// platform independent versions // platform independent versions
#if defined(__UNIX__) && !defined(__CYGWIN__) #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__EMX__)
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX
#define wxPATH_SEP wxPATH_SEP_UNIX #define wxPATH_SEP wxPATH_SEP_UNIX
#elif defined(__MAC__) #elif defined(__MAC__)
@@ -296,7 +296,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
// this is useful for wxString::IsSameAs(): to compare two file names use // this is useful for wxString::IsSameAs(): to compare two file names use
// filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE) // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
#if defined(__UNIX__) && !defined(__DARWIN__) #if defined(__UNIX__) && !defined(__DARWIN__) && !defined(__EMX__)
#define wxARE_FILENAMES_CASE_SENSITIVE TRUE #define wxARE_FILENAMES_CASE_SENSITIVE TRUE
#else // Windows, Mac OS and OS/2 #else // Windows, Mac OS and OS/2
#define wxARE_FILENAMES_CASE_SENSITIVE FALSE #define wxARE_FILENAMES_CASE_SENSITIVE FALSE
@@ -306,7 +306,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
inline bool wxIsPathSeparator(wxChar c) inline bool wxIsPathSeparator(wxChar c)
{ {
// under DOS/Windows we should understand both Unix and DOS file separators // under DOS/Windows we should understand both Unix and DOS file separators
#if defined(__UNIX__) || defined(__MAC__) #if ( defined(__UNIX__) && !defined(__EMX__) )|| defined(__MAC__)
return c == wxFILE_SEP_PATH; return c == wxFILE_SEP_PATH;
#else #else
return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX;