X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/app.h?ds=inline diff --git a/include/wx/app.h b/include/wx/app.h index d4ff103779..2aa047d3a9 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -32,6 +32,7 @@ class WXDLLIMPEXP_FWD_BASE wxMessageOutput; #if wxUSE_GUI struct WXDLLIMPEXP_FWD_CORE wxVideoMode; + class WXDLLIMPEXP_FWD_CORE wxWindow; #endif // ---------------------------------------------------------------------------- @@ -82,9 +83,6 @@ public: // class OnInit() to do it. virtual bool OnInit(); - // this is here only temporary hopefully (FIXME) - virtual bool OnInitGui() { return true; } - // This is the replacement for the normal main(): all program work should // be done here. When OnRun() returns, the programs starts shutting down. virtual int OnRun(); @@ -220,6 +218,10 @@ public: // had been already processed or won't be processed at all, respectively virtual int FilterEvent(wxEvent& event); + // return true if we're running event loop, i.e. if the events can + // (already) be dispatched + static bool IsMainLoopRunning(); + #if wxUSE_EXCEPTIONS // execute the functor to handle the given event // @@ -245,60 +247,35 @@ public: // exit, if you need to really handle the exceptions you need to override // OnExceptionInMainLoop() virtual void OnUnhandledException(); + + // Function called if an uncaught exception is caught inside the main + // event loop: it may return true to continue running the event loop or + // false to stop it (in the latter case it may rethrow the exception as + // well) + virtual bool OnExceptionInMainLoop(); + #endif // wxUSE_EXCEPTIONS - // event processing functions - // -------------------------- - // return true if we're running event loop, i.e. if the events can - // (already) be dispatched - static bool IsMainLoopRunning(); + // wxEventLoop redirections + // ------------------------ - // process all events in the wxHandlersWithPendingEvents list -- it is necessary - // to call this function to process posted events. This happens during each - // event loop iteration in GUI mode but if there is no main loop, it may be - // also called directly. + virtual void SuspendProcessingOfPendingEvents(); + virtual void ResumeProcessingOfPendingEvents(); virtual void ProcessPendingEvents(); - - // check if there are pending events on global pending event list bool HasPendingEvents() const; - // doesn't do anything in this class, just a hook for GUI wxApp - virtual bool Yield(bool WXUNUSED(onlyIfNeeded) = false) { return true; } - - // make sure that idle events are sent again - virtual void WakeUpIdle(); + virtual bool Pending(); + virtual bool Dispatch(); - // execute the main GUI loop, the function returns when the loop ends virtual int MainLoop(); - - // exit the main GUI loop during the next iteration (i.e. it does not - // stop the program immediately!) virtual void ExitMainLoop(); - // returns true if there are unprocessed events in the event queue - virtual bool Pending(); - - // process the first event in the event queue (blocks until an event - // appears if there are none currently, use Pending() if this is not - // wanted), returns false if the event loop should stop and true - // otherwise - virtual bool Dispatch(); + bool Yield(bool onlyIfNeeded = false); - // this virtual function is called when the application - // becomes idle and normally just sends wxIdleEvent to all interested - // parties - // - // it should return true if more idle events are needed, false if not + virtual void WakeUpIdle(); virtual bool ProcessIdle(); -#if wxUSE_EXCEPTIONS - // Function called if an uncaught exception is caught inside the main - // event loop: it may return true to continue running the event loop or - // false to stop it (in the latter case it may rethrow the exception as - // well) - virtual bool OnExceptionInMainLoop(); -#endif // wxUSE_EXCEPTIONS // debugging support // ----------------- @@ -366,7 +343,6 @@ protected: // for the first time virtual wxAppTraits *CreateTraits(); - // function used for dynamic wxApp creation static wxAppInitializerFunction ms_appInitFn; @@ -392,9 +368,11 @@ protected: // been started yet or has already terminated) wxEventLoopBase *m_mainLoop; + friend class WXDLLIMPEXP_FWD_BASE wxEvtHandler; + // the application object is a singleton anyhow, there is no sense in // copying it - DECLARE_NO_COPY_CLASS(wxAppConsoleBase) + wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); }; #if defined(__UNIX__) @@ -451,22 +429,9 @@ public: // the worker functions - usually not used directly by the user code // ----------------------------------------------------------------- - - - // process all currently pending events right now - // - // it is an error to call Yield() recursively unless the value of - // onlyIfNeeded is true - // - // WARNING: this function is dangerous as it can lead to unexpected - // reentrancies (i.e. when called from an event handler it - // may result in calling the same event handler again), use - // with _extreme_ care or, better, don't use at all! - virtual bool Yield(bool onlyIfNeeded = false) = 0; - - // returns true if the main thread is inside a Yield() call - bool IsYielding() const - { return m_isInsideYield; } + // safer alternatives to Yield(), using wxWindowDisabler + virtual bool SafeYield(wxWindow *win, bool onlyIfNeeded); + virtual bool SafeYieldFor(wxWindow *win, long eventsToProcess); // this virtual function is called in the GUI mode when the application // becomes idle and normally just sends wxIdleEvent to all interested @@ -590,9 +555,7 @@ protected: // does any of our windows have focus? bool m_isActive; - bool m_isInsideYield; - - DECLARE_NO_COPY_CLASS(wxAppBase) + wxDECLARE_NO_COPY_CLASS(wxAppBase); }; #if WXWIN_COMPATIBILITY_2_6 @@ -660,7 +623,7 @@ protected: // Force an exit from main loop WXDLLIMPEXP_BASE void wxExit(); -// avoid redeclaring this function here if it had been already declated by +// avoid redeclaring this function here if it had been already declared by // wx/utils.h, this results in warnings from g++ with -Wredundant-decls #ifndef wx_YIELD_DECLARED #define wx_YIELD_DECLARED