X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c51deffc32ff80f4ed13a1095bbf2ff44de89505..6b82d89473972919c10d264efc94dd1ea4d64d9f:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 9dd4d99b3e..ec09523cc7 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -70,14 +70,6 @@ #include #endif -// Pattern matching code. (FIXME) -// Yes, this path is deliberate (for Borland compilation) -#ifdef wx_mac /* MATTHEW: [5] Mac doesn't like paths with "/" */ -#include "glob.inc" -#else -#include "../common/glob.inc" -#endif - #ifdef __WXMSW__ #include "windows.h" #endif @@ -873,19 +865,14 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, { case wxID_OK: return wxOK; - break; case wxID_YES: return wxYES; - break; case wxID_NO: return wxNO; - break; default: case wxID_CANCEL: return wxCANCEL; - break; } - return ans; } #if wxUSE_TEXTDLG @@ -1048,3 +1035,37 @@ wxString wxGetHomeDir() return home; } + +#if 0 + +wxString wxGetCurrentDir() +{ + wxString dir; + size_t len = 1024; + bool ok; + do + { + ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL; + dir.UngetWriteBuf(); + + if ( !ok ) + { + if ( errno != ERANGE ) + { + wxLogSysError(_T("Failed to get current directory")); + + return wxEmptyString; + } + else + { + // buffer was too small, retry with a larger one + len *= 2; + } + } + //else: ok + } while ( !ok ); + + return dir; +} + +#endif // 0