X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f212e222e736f9f24d86edb5717508a159c38692..80cc5fc7ad102221a1ce9e160eac3c29a0586664:/include/wx/evtloop.h diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 5528d8be31..bb22bb84db 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -116,7 +116,7 @@ protected: #elif defined(__WXMSW__) #include "wx/msw/evtloop.h" #elif defined(__WXMAC__) - #include "wx/mac/evtloop.h" + #include "wx/osx/evtloop.h" #elif defined(__WXDFB__) #include "wx/dfb/evtloop.h" #else // other platform @@ -156,7 +156,7 @@ protected: #else // !GUI // we can't define wxEventLoop differently in GUI and base libraries so use // a #define to still allow writing wxEventLoop in the user code - #if defined(__WXMSW__) || defined(__UNIX__) + #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WXMSW__) || defined(__UNIX__)) #define wxEventLoop wxConsoleEventLoop #else // we still must define it somehow for the code below... #define wxEventLoop wxEventLoopBase @@ -223,6 +223,8 @@ private: wxEventLoopBase *m_evtLoopOld; }; +#if wxUSE_CONSOLE_EVENTLOOP + class wxEventLoopGuarantor { public: @@ -249,4 +251,6 @@ private: wxEventLoop *m_evtLoopNew; }; +#endif // wxUSE_CONSOLE_EVENTLOOP + #endif // _WX_EVTLOOP_H_