X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfc6f510c5f5efdc1f072996ddf1ae0416a4a4ad..6c73e20df7f3a7ea8c2059a816ffd3655ea2b848:/src/unix/baseunix.cpp diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index 77466c6560..de2ee2f156 100644 --- a/src/unix/baseunix.cpp +++ b/src/unix/baseunix.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: unix/baseunix.cpp +// Name: src/unix/baseunix.cpp // Purpose: misc stuff only used in console applications under Unix // Author: Vadim Zeitlin // Modified by: @@ -27,10 +27,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/intl.h" + #include "wx/utils.h" #endif //WX_PRECOMP #include "wx/apptrait.h" -#include "wx/utils.h" #include "wx/unix/execute.h" // for waitpid() @@ -85,8 +85,8 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData) // misc other stuff // ---------------------------------------------------------------------------- -// this is in mac/utils.cpp under Mac and MGL -#if !defined(__WXMAC__) && !defined(__WXMGL__) +// this is in mac/utils.cpp under Mac +#if !defined(__WXMAC__) wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() { @@ -123,4 +123,3 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() } #endif // __WXMAC__ -