X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index d78a126972..8a33c3f31f 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -26,22 +26,26 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/window.h" #include "wx/bitmap.h" - #include "wx/intl.h" - #include "wx/list.h" #include "wx/log.h" #include "wx/msgdlg.h" - #include "wx/bitmap.h" #include "wx/confbase.h" + #include "wx/utils.h" + #include "wx/wxcrtvararg.h" #endif #include "wx/apptrait.h" #include "wx/cmdline.h" -#include "wx/evtloop.h" #include "wx/msgout.h" #include "wx/thread.h" -#include "wx/utils.h" -#include "wx/ptr_scpd.h" +#include "wx/vidmode.h" + +#ifdef __WXDEBUG__ + #if wxUSE_STACKWALKER + #include "wx/stackwalk.h" + #endif // wxUSE_STACKWALKER +#endif // __WXDEBUG__ #if defined(__WXMSW__) #include "wx/msw/private.h" // includes windows.h for LOGFONT @@ -55,13 +59,7 @@ #include "wx/build.h" WX_CHECK_BUILD_OPTIONS("wxCore") - -// ---------------------------------------------------------------------------- -// wxEventLoopPtr -// ---------------------------------------------------------------------------- - -// this defines wxEventLoopPtr -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop) +WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; // ============================================================================ // wxAppBase implementation @@ -74,10 +72,11 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop) wxAppBase::wxAppBase() { m_topWindow = (wxWindow *)NULL; + m_useBestVisual = false; - m_isActive = true; + m_forceTrueColour = false; - m_mainLoop = NULL; + m_isActive = true; // We don't want to exit the app if the user code shows a dialog from its // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete @@ -99,10 +98,6 @@ bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig) if ( !wxAppConsole::Initialize(argcOrig, argvOrig) ) return false; -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection; -#endif - wxInitializeStockLists(); wxBitmap::InitStandardHandlers(); @@ -143,18 +138,49 @@ void wxAppBase::CleanUp() delete wxTheColourDatabase; wxTheColourDatabase = NULL; - delete wxPendingEvents; - wxPendingEvents = NULL; - #if wxUSE_THREADS - delete wxPendingEventsLocker; - wxPendingEventsLocker = NULL; - #if wxUSE_VALIDATORS // If we don't do the following, we get an apparent memory leak. ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); #endif // wxUSE_VALIDATORS #endif // wxUSE_THREADS + + wxAppConsole::CleanUp(); +} + +// ---------------------------------------------------------------------------- +// various accessors +// ---------------------------------------------------------------------------- + +wxWindow* wxAppBase::GetTopWindow() const +{ + wxWindow* window = m_topWindow; + if (window == NULL && wxTopLevelWindows.GetCount() > 0) + window = wxTopLevelWindows.GetFirst()->GetData(); + return window; +} + +wxVideoMode wxAppBase::GetDisplayMode() const +{ + return wxVideoMode(); +} + +wxLayoutDirection wxAppBase::GetLayoutDirection() const +{ +#if wxUSE_INTL + const wxLocale *const locale = wxGetLocale(); + if ( locale ) + { + const wxLanguageInfo *const + info = wxLocale::GetLanguageInfo(locale->GetLanguage()); + + if ( info ) + return info->LayoutDirection; + } +#endif // wxUSE_INTL + + // we don't know + return wxLayout_Default; } #if wxUSE_CMDLINE_PARSER @@ -253,45 +279,6 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) #endif // wxUSE_CMDLINE_PARSER -// ---------------------------------------------------------------------------- -// main event loop implementation -// ---------------------------------------------------------------------------- - -int wxAppBase::MainLoop() -{ - wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop); - - return m_mainLoop->Run(); -} - -void wxAppBase::ExitMainLoop() -{ - // we should exit from the main event loop, not just any currently active - // (e.g. modal dialog) event loop - if ( m_mainLoop && m_mainLoop->IsRunning() ) - { - m_mainLoop->Exit(0); - } -} - -bool wxAppBase::Pending() -{ - // use the currently active message loop here, not m_mainLoop, because if - // we're showing a modal dialog (with its own event loop) currently the - // main event loop is not running anyhow - wxEventLoop * const loop = wxEventLoop::GetActive(); - - return loop && loop->Pending(); -} - -bool wxAppBase::Dispatch() -{ - // see comment in Pending() - wxEventLoop * const loop = wxEventLoop::GetActive(); - - return loop && loop->Dispatch(); -} - // ---------------------------------------------------------------------------- // OnXXX() hooks // ---------------------------------------------------------------------------- @@ -316,7 +303,7 @@ int wxAppBase::OnRun() } //else: it has been changed, assume the user knows what he is doing - return MainLoop(); + return wxAppConsole::OnRun(); } int wxAppBase::OnExit() @@ -328,11 +315,6 @@ int wxAppBase::OnExit() return wxAppConsole::OnExit(); } -void wxAppBase::Exit() -{ - ExitMainLoop(); -} - wxAppTraits *wxAppBase::CreateTraits() { return new wxGUIAppTraits; @@ -366,11 +348,14 @@ void wxAppBase::DeletePendingObjects() { wxObject *obj = node->GetData(); - delete obj; - - if (wxPendingDelete.Member(obj)) + // remove it from the list first so that if we get back here somehow + // during the object deletion (e.g. wxYield called from its dtor) we + // wouldn't try to delete it the second time + if ( wxPendingDelete.Member(obj) ) wxPendingDelete.Erase(node); + delete obj; + // Deleting one object may have deleted other pending // objects, so start from beginning of list again. node = wxPendingDelete.GetFirst(); @@ -380,6 +365,9 @@ void wxAppBase::DeletePendingObjects() // Returns true if more time is needed. bool wxAppBase::ProcessIdle() { + // process pending wx events before sending idle events + ProcessPendingEvents(); + wxIdleEvent event; bool needMore = false; wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); @@ -391,11 +379,17 @@ bool wxAppBase::ProcessIdle() node = node->GetNext(); } - event.SetEventObject(this); - (void) ProcessEvent(event); - if (event.MoreRequested()) + if (wxAppConsole::ProcessIdle()) needMore = true; + // 'Garbage' collection of windows deleted with Close(). + DeletePendingObjects(); + +#if wxUSE_LOG + // flush the logged messages if any + wxLog::FlushActive(); +#endif + wxUpdateUIEvent::ResetUpdateTime(); return needMore; @@ -408,7 +402,9 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) win->OnInternalIdle(); - if (wxIdleEvent::CanSend(win)) + // should we send idle event to this window? + if ( wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL || + win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) ) { event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event); @@ -429,45 +425,6 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) return needMore; } -void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event)) -{ - // If there are pending events, we must process them: pending events - // are either events to the threads other than main or events posted - // with wxPostEvent() functions - // GRG: I have moved this here so that all pending events are processed - // before starting to delete any objects. This behaves better (in - // particular, wrt wxPostEvent) and is coherent with wxGTK's current - // behaviour. Changed Feb/2000 before 2.1.14 - ProcessPendingEvents(); - - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); - -#if wxUSE_LOG - // flush the logged messages if any - wxLog::FlushActive(); -#endif // wxUSE_LOG - -} - -// ---------------------------------------------------------------------------- -// exceptions support -// ---------------------------------------------------------------------------- - -#if wxUSE_EXCEPTIONS - -bool wxAppBase::OnExceptionInMainLoop() -{ - throw; - - // some compilers are too stupid to know that we never return after throw -#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200) - return false; -#endif -} - -#endif // wxUSE_EXCEPTIONS - // ---------------------------------------------------------------------------- // wxGUIAppTraitsBase // ---------------------------------------------------------------------------- @@ -524,15 +481,27 @@ wxRendererNative *wxGUIAppTraitsBase::CreateRenderer() bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) { +#if defined(__WXMSW__) || !wxUSE_MSGDLG // under MSW we prefer to use the base class version using ::MessageBox() // even if wxMessageBox() is available because it has less chances to // double fault our app than our wxMessageBox() -#if defined(__WXMSW__) || !wxUSE_MSGDLG return wxAppTraitsBase::ShowAssertDialog(msg); #else // wxUSE_MSGDLG + wxString msgDlg = msg; + +#if wxUSE_STACKWALKER + // on Unix stack frame generation may take some time, depending on the + // size of the executable mainly... warn the user that we are working + wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait")); + fflush(stderr); + + const wxString stackTrace = GetAssertStackTrace(); + if ( !stackTrace.empty() ) + msgDlg << _T("\n\nCall stack:\n") << stackTrace; +#endif // wxUSE_STACKWALKER + // this message is intentionally not translated -- it is for // developpers only - wxString msgDlg(msg); msgDlg += wxT("\nDo you want to stop the program?\n") wxT("You can also choose [Cancel] to suppress ") wxT("further warnings.");