Extract OS X non-GUI event loop in a separate header.
This will allow its reuse from non-wxOSX ports, e.g. wxGTK under OS X. Closes #14519. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -236,8 +236,17 @@ private:
|
||||
#if defined(__DARWIN__)
|
||||
// CoreFoundation-based event loop is currently in wxBase so include it in
|
||||
// any case too (although maybe it actually shouldn't be there at all)
|
||||
#include "wx/osx/evtloop.h"
|
||||
#elif wxUSE_GUI
|
||||
#include "wx/osx/core/evtloop.h"
|
||||
#endif
|
||||
|
||||
// include the header defining wxConsoleEventLoop
|
||||
#if defined(__UNIX__) && !defined(__WXMSW__)
|
||||
#include "wx/unix/evtloop.h"
|
||||
#elif defined(__WINDOWS__)
|
||||
#include "wx/msw/evtloopconsole.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
// include the appropriate header defining wxGUIEventLoop
|
||||
|
||||
@@ -245,6 +254,8 @@ private:
|
||||
#include "wx/msw/evtloop.h"
|
||||
#elif defined(__WXCOCOA__)
|
||||
#include "wx/cocoa/evtloop.h"
|
||||
#elif defined(__WXOSX__)
|
||||
#include "wx/osx/evtloop.h"
|
||||
#elif defined(__WXDFB__)
|
||||
#include "wx/dfb/evtloop.h"
|
||||
#elif defined(__WXGTK20__)
|
||||
@@ -306,13 +317,6 @@ protected:
|
||||
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// include the header defining wxConsoleEventLoop for Unix systems
|
||||
#if defined(__UNIX__) && !defined(__WXMSW__)
|
||||
#include "wx/unix/evtloop.h"
|
||||
#elif defined(__WINDOWS__)
|
||||
#include "wx/msw/evtloopconsole.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_GUI
|
||||
// we use a class rather than a typedef because wxEventLoop is
|
||||
// forward-declared in many places
|
||||
|
Reference in New Issue
Block a user