X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/134677bde90cc4132fd51af76736e41ca6acaf6c..e26c0634d0040057f09d902842c2b77aa9f0cbfc:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index a294d53d5d..724f54de2a 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -36,6 +36,7 @@ #include "wx/log.h" #if wxUSE_GUI + #include "wx/app.h" #include "wx/window.h" #include "wx/frame.h" #include "wx/menu.h" @@ -105,7 +106,7 @@ // string functions // ---------------------------------------------------------------------------- -#ifdef __WXMAC__ +#if defined(__WXMAC__) && !defined(__DARWIN__) int strcasecmp(const char *str_1, const char *str_2) { register char c1, c2; @@ -134,7 +135,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) return 0 ; } -#endif // wxMAC +#endif // __WXMAC__ && !__DARWIN__ #if defined( __VMS__ ) && ( __VMS_VER < 70000000 ) // we have no strI functions under VMS, therefore I have implemented @@ -1312,4 +1313,25 @@ long wxExecute(const wxString& command, return wxDoExecuteWithCapture(command, output, &error); } +// ---------------------------------------------------------------------------- +// wxApp::Yield() wrappers for backwards compatibility +// ---------------------------------------------------------------------------- + +bool wxYield() +{ +#if wxUSE_GUI + return wxTheApp && wxTheApp->Yield(); +#else + return FALSE; +#endif +} + +bool wxYieldIfNeeded() +{ +#if wxUSE_GUI + return wxTheApp && wxTheApp->Yield(TRUE); +#else + return FALSE; +#endif +}