X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7bc57fd972ddf7621bc6d4716e6dbda1cf09312e..ef5fe20c795be38940d3f8ba4424cf26234e6d6f:/include/wx/utils.h diff --git a/include/wx/utils.h b/include/wx/utils.h index 45ae16eea5..8ef0cff3b0 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -410,12 +410,12 @@ WXDLLIMPEXP_BASE long wxExecute(const wxString& command, int flags = 0, const wxExecuteEnv *env = NULL); -#if defined(__WXMSW__) && wxUSE_IPC +#if defined(__WINDOWS__) && wxUSE_IPC // ask a DDE server to execute the DDE request with given parameters WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer, const wxString& ddeTopic, const wxString& ddeCommand); -#endif // __WXMSW__ && wxUSE_IPC +#endif // __WINDOWS__ && wxUSE_IPC enum wxSignal { @@ -815,8 +815,8 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded(); // Windows resources access // ---------------------------------------------------------------------------- -// MSW only: get user-defined resource from the .res file. -#ifdef __WXMSW__ +// Windows only: get user-defined resource from the .res file. +#ifdef __WINDOWS__ // default resource type for wxLoadUserResource() extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxUserResourceStr; @@ -843,7 +843,7 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded(); const wxString& resourceType = wxUserResourceStr, int* pLen = NULL, WXHINSTANCE module = 0); -#endif // MSW +#endif // __WINDOWS__ #endif // _WX_UTILSH__