X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42dcacf02b163699d4623097c4d04980f11d9040..8f4fcc4ee080b020057cc028a809ffc884f63bb8:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 2a2bba6bf7..417ad1069f 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -317,8 +317,10 @@ static const char * icon8_xpm[] = { #if defined(__DOS__) -static bool wxIsDriveAvailable(const wxString dirName) +bool wxIsDriveAvailable(const wxString& dirName) { + // FIXME_MGL - this method leads to hang up under Watcom for some reason +#ifndef __WATCOMC__ if ( dirName.Len() == 3 && dirName[1u] == wxT(':') ) { wxString dirNameLower(dirName.Lower()); @@ -329,6 +331,7 @@ static bool wxIsDriveAvailable(const wxString dirName) wxPathExists(dirNameLower)); } else +#endif return TRUE; } @@ -363,7 +366,7 @@ int setdrive(int drive) #endif // !GNUWIN32 } -static bool wxIsDriveAvailable(const wxString dirName) +bool wxIsDriveAvailable(const wxString& dirName) { #ifdef __WIN32__ UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);