X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9aee1212251a85e7e52246a621e921af7da6be8d..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/osx/evtloop.h?ds=inline diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h index b86cfeecf3..4e45db718c 100644 --- a/include/wx/osx/evtloop.h +++ b/include/wx/osx/evtloop.h @@ -1,7 +1,8 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/osx/evtloop.h -// Purpose: simply forwards to wx/mac/carbon/evtloop.h for consistency with -// the other Mac headers +// Name: wx/osx/evtloop.h +// Purpose: simply forwards to wx/osx/carbon/evtloop.h or +// wx/osx/cocoa/evtloop.h for consistency with the other Mac +// headers // Author: Vadim Zeitlin // Modified by: // Created: 2006-01-12 @@ -25,17 +26,17 @@ public: // enters a loop calling OnNextIteration(), Pending() and Dispatch() and // terminating when Exit() is called virtual int Run(); - + // sets the "should exit" flag and wakes up the loop so that it terminates // soon virtual void Exit(int rc = 0); - + // return true if any events are available virtual bool Pending() const; - + // dispatch a single event, return false if we should exit from the loop virtual bool Dispatch(); - + // same as Dispatch() but doesn't wait for longer than the specified (in // ms) timeout, return true if an event was processed, false if we should // exit the loop or -1 if timeout expired @@ -44,7 +45,7 @@ public: // implement this to wake up the loop: usually done by posting a dummy event // to it (can be called from non main thread) virtual void WakeUp(); - + virtual bool YieldFor(long eventsToProcess); #if wxUSE_EVENTLOOP_SOURCE @@ -59,23 +60,23 @@ protected: virtual CFRunLoopRef CFGetCurrentRunLoop() const; virtual int DoDispatchTimeout(unsigned long timeout); - + virtual void DoRun(); virtual void DoStop(); - + // should we exit the loop? bool m_shouldExit; // the loop exit code int m_exitcode; - + // cfrunloop CFRunLoopRef m_runLoop; - + // runloop observer CFRunLoopObserverRef m_runLoopObserver; - + private: // process all already pending events and dispatch a new one (blocking // until it appears in the event queue if necessary) @@ -98,15 +99,17 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop { public: - wxModalEventLoop(wxWindow *winModal); - + wxModalEventLoop(wxWindow *modalWindow); + wxModalEventLoop(WXWindow modalNativeWindow); + protected: virtual void DoRun(); - + virtual void DoStop(); - + // (in case) the modal window for this event loop wxNonOwnedWindow* m_modalWindow; + WXWindow m_modalNativeWindow; }; #endif // wxUSE_GUI