X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ff14574fc48a85531252d675b1cf8cfadb65399..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/appcmn.cpp?ds=sidebyside diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index fb02e6b93d..15f409dbd6 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -32,15 +32,20 @@ #include "wx/msgdlg.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/vidmode.h" -#include "wx/ptr_scpd.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 @@ -56,13 +61,6 @@ WX_CHECK_BUILD_OPTIONS("wxCore") WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; -// ---------------------------------------------------------------------------- -// wxEventLoopPtr -// ---------------------------------------------------------------------------- - -// this defines wxEventLoopPtr -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop) - // ============================================================================ // 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,20 +138,11 @@ 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 @@ -172,14 +158,32 @@ 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 // ---------------------------------------------------------------------------- // GUI-specific command line options handling // ---------------------------------------------------------------------------- -#define OPTION_THEME _T("theme") -#define OPTION_MODE _T("mode") +#define OPTION_THEME "theme" +#define OPTION_MODE "mode" void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) { @@ -192,7 +196,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) #ifdef __WXUNIVERSAL__ { wxCMD_LINE_OPTION, - wxEmptyString, + NULL, OPTION_THEME, gettext_noop("specify the theme to use"), wxCMD_LINE_VAL_STRING, @@ -206,7 +210,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) // and not mgl/app.cpp { wxCMD_LINE_OPTION, - wxEmptyString, + NULL, OPTION_MODE, gettext_noop("specify display mode to use (e.g. 640x480-16)"), wxCMD_LINE_VAL_STRING, @@ -215,14 +219,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) #endif // __WXMGL__ // terminator - { - wxCMD_LINE_NONE, - wxEmptyString, - wxEmptyString, - wxEmptyString, - wxCMD_LINE_VAL_NONE, - 0x0 - } + wxCMD_LINE_DESC_END }; parser.SetDesc(cmdLineGUIDesc); @@ -268,45 +265,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 // ---------------------------------------------------------------------------- @@ -331,7 +289,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() @@ -343,11 +301,6 @@ int wxAppBase::OnExit() return wxAppConsole::OnExit(); } -void wxAppBase::Exit() -{ - ExitMainLoop(); -} - wxAppTraits *wxAppBase::CreateTraits() { return new wxGUIAppTraits; @@ -398,6 +351,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(); @@ -409,11 +365,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; @@ -426,7 +388,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); @@ -447,45 +411,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 // ---------------------------------------------------------------------------- @@ -494,7 +419,9 @@ bool wxAppBase::OnExceptionInMainLoop() wxLog *wxGUIAppTraitsBase::CreateLogTarget() { -#if wxUSE_LOGGUI +// DE: One day I'll remove this but right now the generic dialog used for this +// just doesn't work right at all on wxCocoa. +#if wxUSE_LOGGUI && !defined(__WXCOCOA__) return new wxLogGui; #else // we must have something! @@ -517,8 +444,10 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput() // wxMessageOutputMessageBox doesn't work under Motif #ifdef __WXMOTIF__ return new wxMessageOutputLog; - #else + #elif wxUSE_MSGDLG return new wxMessageOutputMessageBox; + #else + return new wxMessageOutputStderr; #endif #endif // __UNIX__/!__UNIX__ } @@ -542,15 +471,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."); @@ -597,34 +538,3 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) wxPendingDelete.DeleteObject(object); } -#if wxUSE_SOCKETS - -#if defined(__WINDOWS__) - #include "wx/msw/gsockmsw.h" -#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__) - #include "wx/unix/gsockunx.h" -#elif defined(__WXMAC__) - #include - #define OTUNIXERRORS 1 - #include - #include - #include - - #include "wx/mac/gsockmac.h" -#else - #error "Must include correct GSocket header here" -#endif - -GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() -{ -#if defined(__WXMAC__) && !defined(__DARWIN__) - // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and - // so it doesn't need this table at all - return NULL; -#else // !__WXMAC__ || __DARWIN__ - static GSocketGUIFunctionsTableConcrete table; - return &table; -#endif // !__WXMAC__ || __DARWIN__ -} - -#endif