X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a905235eb0477b0b2ae489d88ebb80363e4151a6..b37023dca3a8627cee3fd26bf9cd9dae46e4a5b1:/src/unix/baseunix.cpp diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index 7eb4e77964..b265339a06 100644 --- a/src/unix/baseunix.cpp +++ b/src/unix/baseunix.cpp @@ -30,6 +30,7 @@ #endif //WX_PRECOMP #include "wx/apptrait.h" +#include "wx/utils.h" #include "wx/unix/execute.h" // for waitpid() @@ -84,10 +85,8 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData) // misc other stuff // ---------------------------------------------------------------------------- -// WXWIN_OS_DESCRIPTION is normally defined by configure -#if defined( __MWERKS__ ) && defined(__MACH__) - #define WXWIN_OS_DESCRIPTION "MacOS X" -#endif +// this is in mac/utils.cpp under Mac +#ifndef __WXMAC__ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin) { @@ -109,3 +108,5 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin) return wxUNIX; } +#endif // __WXMAC__ +