X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bf77ee556a5418059139305e9edb05bde9b8a1d..2b9a7d4cc2f5f55df3d83f7cf2160cf9a509a4f2:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 7bb2873177..d4bc4cfe56 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -48,7 +48,7 @@ #include "wx/ptr_scpd.h" #if defined(__WXMSW__) - #include "wx/msw/private.h" // includes windows.h for LOGFONT + #include "wx/msw/private.h" // includes windows.h for LOGFONT #endif #if wxUSE_FONTMAP @@ -65,23 +65,7 @@ WX_CHECK_BUILD_OPTIONS("wxCore") // ---------------------------------------------------------------------------- // this defines wxEventLoopPtr -wxDEFINE_SCOPED_PTR_TYPE(wxEventLoop); - -// but we need a smart pointer tied to wxAppBase::m_mainLoop, so we define -// another helper class -class wxTiedEventLoopPtr : public wxEventLoopPtr -{ -public: - wxTiedEventLoopPtr(wxEventLoop **ppEvtLoop, wxEventLoop *pLoop) - : wxEventLoopPtr(*ppEvtLoop = pLoop), m_ppEvtLoop(ppEvtLoop) - { - } - - ~wxTiedEventLoopPtr() { *m_ppEvtLoop = NULL; } - -private: - wxEventLoop **m_ppEvtLoop; -}; +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop); // ============================================================================ // wxAppBase implementation @@ -94,10 +78,12 @@ private: wxAppBase::wxAppBase() { m_topWindow = (wxWindow *)NULL; - m_useBestVisual = FALSE; - m_isActive = TRUE; + m_useBestVisual = false; + m_isActive = true; +#if wxUSE_EVTLOOP_IN_APP m_mainLoop = NULL; +#endif // wxUSE_EVTLOOP_IN_APP // 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 @@ -105,10 +91,10 @@ wxAppBase::wxAppBase() // OTOH, if we set it to No initially we'll have to overwrite it with Yes // when we enter our OnRun() because we do want the default behaviour from // then on. But this would be a problem if the user code calls - // SetExitOnFrameDelete(FALSE) from OnInit(). + // SetExitOnFrameDelete(false) from OnInit(). // // So we use the special "Later" value which is such that - // GetExitOnFrameDelete() returns FALSE for it but which we know we can + // GetExitOnFrameDelete() returns false for it but which we know we can // safely (i.e. without losing the effect of the users SetExitOnFrameDelete // call) overwrite in OnRun() m_exitOnFrameDelete = Later; @@ -142,9 +128,19 @@ wxAppBase::~wxAppBase() void wxAppBase::CleanUp() { - // one last chance for pending objects to be cleaned up + // clean up all the pending objects DeletePendingObjects(); + // and any remaining TLWs (they remove themselves from wxTopLevelWindows + // when destroyed, so iterate until none are left) + while ( !wxTopLevelWindows.empty() ) + { + // do not use Destroy() here as it only puts the TLW in pending list + // but we want to delete them now + delete wxTopLevelWindows.GetFirst()->GetData(); + } + + // undo everything we did in Initialize() above wxBitmap::CleanUpHandlers(); wxDeleteStockObjects(); @@ -154,10 +150,10 @@ void wxAppBase::CleanUp() delete wxTheColourDatabase; wxTheColourDatabase = NULL; -#if wxUSE_THREADS delete wxPendingEvents; wxPendingEvents = NULL; +#if wxUSE_THREADS delete wxPendingEventsLocker; wxPendingEventsLocker = NULL; @@ -188,7 +184,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) #ifdef __WXUNIVERSAL__ { wxCMD_LINE_OPTION, - _T(""), + wxEmptyString, OPTION_THEME, gettext_noop("specify the theme to use"), wxCMD_LINE_VAL_STRING, @@ -202,7 +198,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) // and not mgl/app.cpp { wxCMD_LINE_OPTION, - _T(""), + wxEmptyString, OPTION_MODE, gettext_noop("specify display mode to use (e.g. 640x480-16)"), wxCMD_LINE_VAL_STRING, @@ -213,9 +209,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) // terminator { wxCMD_LINE_NONE, - _T(""), - _T(""), - _T(""), + wxEmptyString, + wxEmptyString, + wxEmptyString, wxCMD_LINE_VAL_NONE, 0x0 } @@ -234,7 +230,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) if ( !theme ) { wxLogError(_("Unsupported theme '%s'."), themeName.c_str()); - return FALSE; + return false; } // Delete the defaultly created theme and set the new theme. @@ -251,11 +247,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 ) { wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str()); - return FALSE; + return false; } - if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) ) - return FALSE; + if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) ) + return false; } #endif // __WXMGL__ @@ -270,37 +266,51 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) int wxAppBase::MainLoop() { - wxTiedEventLoopPtr mainLoop(&m_mainLoop, new wxEventLoop); +#if wxUSE_EVTLOOP_IN_APP + wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop); return m_mainLoop->Run(); +#else // !wxUSE_EVTLOOP_IN_APP + return 0; +#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP } void wxAppBase::ExitMainLoop() { +#if wxUSE_EVTLOOP_IN_APP // we should exit from the main event loop, not just any currently active // (e.g. modal dialog) event loop - if ( m_mainLoop ) + if ( m_mainLoop && m_mainLoop->IsRunning() ) { m_mainLoop->Exit(0); } +#endif // wxUSE_EVTLOOP_IN_APP } bool wxAppBase::Pending() { +#if wxUSE_EVTLOOP_IN_APP // 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(); +#else // wxUSE_EVTLOOP_IN_APP + return false; +#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP } bool wxAppBase::Dispatch() { +#if wxUSE_EVTLOOP_IN_APP // see comment in Pending() wxEventLoop * const loop = wxEventLoop::GetActive(); - return loop ? loop->Dispatch() : true; + return loop && loop->Dispatch(); +#else // wxUSE_EVTLOOP_IN_APP + return true; +#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP } // ---------------------------------------------------------------------------- @@ -311,10 +321,10 @@ bool wxAppBase::OnInitGui() { #ifdef __WXUNIVERSAL__ if ( !wxTheme::Get() && !wxTheme::CreateDefault() ) - return FALSE; + return false; #endif // __WXUNIVERSAL__ - return TRUE; + return true; } int wxAppBase::OnRun() @@ -384,34 +394,34 @@ void wxAppBase::DeletePendingObjects() } } -// Returns TRUE if more time is needed. +// Returns true if more time is needed. bool wxAppBase::ProcessIdle() { wxIdleEvent event; - bool needMore = FALSE; + bool needMore = false; wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); while (node) { wxWindow* win = node->GetData(); if (SendIdleEvents(win, event)) - needMore = TRUE; + needMore = true; node = node->GetNext(); } event.SetEventObject(this); (void) ProcessEvent(event); if (event.MoreRequested()) - needMore = TRUE; + needMore = true; wxUpdateUIEvent::ResetUpdateTime(); - + return needMore; } // Send idle event to window and all subwindows bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) { - bool needMore = FALSE; + bool needMore = false; win->OnInternalIdle(); @@ -421,14 +431,14 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) win->GetEventHandler()->ProcessEvent(event); if (event.MoreRequested()) - needMore = TRUE; + needMore = true; } wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); while ( node ) { wxWindow *child = node->GetData(); if (SendIdleEvents(child, event)) - needMore = TRUE; + needMore = true; node = node->GetNext(); } @@ -465,7 +475,12 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event)) wxLog *wxGUIAppTraitsBase::CreateLogTarget() { +#if wxUSE_LOGGUI return new wxLogGui; +#else + // wem ust have something! + return new wxLogStderr; +#endif } #endif // wxUSE_LOG @@ -521,7 +536,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) wxT("You can also choose [Cancel] to suppress ") wxT("further warnings."); - switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"), + switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"), wxYES_NO | wxCANCEL | wxICON_STOP ) ) { case wxYES: @@ -583,26 +598,14 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() { -#ifdef __WXMAC__ - // NB: wxMac does not have any GUI-specific functions in gsocket.c and +#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__ - static GSocketGUIFunctionsTable table = - { - _GSocket_GUI_Init, - _GSocket_GUI_Cleanup, - _GSocket_GUI_Init_Socket, - _GSocket_GUI_Destroy_Socket, -#ifndef __WINDOWS__ - _GSocket_Install_Callback, - _GSocket_Uninstall_Callback, -#endif - _GSocket_Enable_Events, - _GSocket_Disable_Events - }; +#else // !__WXMAC__ || __DARWIN__ + static GSocketGUIFunctionsTableConcrete table; return &table; -#endif // __WXMAC__/!__WXMAC__ +#endif // !__WXMAC__ || __DARWIN__ } #endif