X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ad76eea22da59402cfe063f0c41803e5dce277a..2190f6aa153416d1c225532bb026df98b3e273ad:/src/common/appcmn.cpp?ds=sidebyside diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index fc3bdeff62..41f3958d47 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -138,13 +138,6 @@ void wxAppBase::CleanUp() delete wxTheColourDatabase; wxTheColourDatabase = NULL; -#if wxUSE_THREADS - #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(); } @@ -400,7 +393,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) ) { event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event); + win->HandleWindowEvent(event); if (event.MoreRequested()) needMore = true; @@ -426,9 +419,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) wxLog *wxGUIAppTraitsBase::CreateLogTarget() { -// 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__) +#if wxUSE_LOGGUI return new wxLogGui; #else // we must have something! @@ -444,7 +435,8 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput() // is (according to common practice): // - console apps: to stderr (on any platform) // - GUI apps: stderr on Unix platforms (!) - // message box under Windows and others + // stderr if available and message box otherwise on others + // (currently stderr only Windows if app running from console) #ifdef __UNIX__ return new wxMessageOutputStderr; #else // !__UNIX__ @@ -452,7 +444,7 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput() #ifdef __WXMOTIF__ return new wxMessageOutputLog; #elif wxUSE_MSGDLG - return new wxMessageOutputMessageBox; + return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR); #else return new wxMessageOutputStderr; #endif @@ -478,10 +470,15 @@ 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() + // + // under DFB the message dialog is not always functional right now + // + // and finally we can't use wxMessageBox() if it wasn't compiled in, of + // course +#if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG return wxAppTraitsBase::ShowAssertDialog(msg); #else // wxUSE_MSGDLG wxString msgDlg = msg; @@ -545,28 +542,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() -{ - static GSocketGUIFunctionsTableConcrete table; - return &table; -} - -#endif