From: Václav Slavík Date: Thu, 23 Jun 2005 16:17:02 +0000 (+0000) Subject: rolled back exceptions handling patch, it relied on incorrect assumption about vtables X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/763b330106e9d3c9c198fc1b1cac4e1ca06c222f rolled back exceptions handling patch, it relied on incorrect assumption about vtables git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/changes.txt b/docs/changes.txt index 8042cee430..a03e675209 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -9,8 +9,6 @@ All: - Fixed wxScopeGuard to work with VC++, documented it. - Fixed proxy handling in wxURL. -- Changed exceptions handling to work under wxGTK, added - virtual wxEvtHandler::DoHandleEvent() wxMSW: diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex index fc1fa101d6..461dcc6f10 100644 --- a/docs/latex/wx/app.tex +++ b/docs/latex/wx/app.tex @@ -197,20 +197,6 @@ different visuals, false otherwise. Returns the application's vendor name. -\membersection{wxApp::HandleEvent}\label{wxapphandleevent} - -\constfunc{virtual void}{HandleEvent}{\param{wxEvtHandler}{ *handler}, \param{wxEventFunction}{ func}, \param{wxEvent\& }{event}} - -This function simply invokes the -\helpref{DoHandleEvent}{wxevthandlerdohandleevent} method of event handler -\arg{handler}, passing \arg{func} and \arg{event} as parameters. If an -exception occurs, \helpref{OnExceptionInMainLoop}{wxapponexceptioninmainloop} -is called by this function. You can override it to customize exceptions -handling. - -If you want to modify this behaviour, override this function. - - \membersection{wxApp::IsActive}\label{wxappisactive} \constfunc{bool}{IsActive}{\void} @@ -679,6 +665,18 @@ This function currently only has effect under GTK. \docparam{flag}{If true, the app will use the best visual.} + +\membersection{wxApp::HandleEvent}\label{wxapphandleevent} + +\constfunc{virtual void}{HandleEvent}{\param{wxEvtHandler}{ *handler}, \param{wxEventFunction}{ func}, \param{wxEvent\& }{event}} + +This function simply invokes the given method \arg{func} of the specified +event handler \arg{handler} with the \arg{event} as parameter. It exists solely +to allow to catch the C++ exceptions which could be thrown by all event +handlers in the application in one place: if you want to do this, override this +function in your wxApp-derived class and add try/catch clause(s) to it. + + \membersection{wxApp::Yield}\label{wxappyield} \func{bool}{Yield}{\param{bool}{ onlyIfNeeded = false}} diff --git a/docs/latex/wx/evthand.tex b/docs/latex/wx/evthand.tex index 8c3e91fc83..98fed35695 100644 --- a/docs/latex/wx/evthand.tex +++ b/docs/latex/wx/evthand.tex @@ -155,20 +155,6 @@ to disconnect functions connected using the (static) event tables. \perlnote{In wxPerl this function takes 3 arguments: \texttt{id, lastid, type}.} -\membersection{wxEvtHandler::DoHandleEvent}\label{wxevthandlerdohandleevent} - -\func{virtual void}{DoHandleEvent}{\param{wxEventFunction}{ func}, \param{wxEvent\& }{event}} - -This function simply invokes the given method \arg{func} of this -event handler with the \arg{event} as parameter. It exists solely -to allow to catch the C++ exceptions which could be thrown by this event -handlers in one place: if you want to do this, override this -function in your wxEvtHandler-derived class and add try/catch clause(s) to it. - -Exceptions not caught at this level propagate to -\helpref{wxApp::HandleEvent}{wxapphandleevent} which in turn calls -\helpref{wxApp::OnExceptionInMainLoop}{wxapponexceptioninmainloop}. - \membersection{wxEvtHandler::GetClientData}\label{wxevthandlergetclientdata} \func{void* }{GetClientData}{\void}