X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/unix/baseunix.cpp?ds=inline diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index 0b03067e58..f675818f43 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,11 +27,14 @@ #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" +#include "wx/evtloop.h" + +#include "wx/unix/private/timer.h" // for waitpid() #include @@ -81,33 +84,15 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData) return exitcode; } -// ---------------------------------------------------------------------------- -// misc other stuff -// ---------------------------------------------------------------------------- +#if wxUSE_TIMER -// this is in mac/utils.cpp under Mac -#ifndef __WXMAC__ - -wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() +wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) { - static wxToolkitInfo info; - int major, minor; - char name[256]; - - if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 ) - { - // unreckognized uname string format - major = - minor = -1; - } - - info.versionMajor = major; - info.versionMinor = minor; - info.name = _T("wxBase"); - info.os = wxUNIX; - - return info; + // this doesn't work yet as there is no main loop in console applications + // (but it will be added later) + return new wxUnixTimerImpl(timer); } -#endif // __WXMAC__ +#endif // wxUSE_TIMER +// Note: wxConsoleAppTraits::CreateEventLoop() is defined in evtloopunix.cpp!