From: Włodzimierz Skiba Date: Wed, 8 Dec 2004 17:00:29 +0000 (+0000) Subject: wxApp decoration to changes list and missed new methods in wxApp section. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/82ce8b17f728fe648f431b379ba23721e0ebc06d?hp=df6735ecdacab47f74e74e2f855fe6bba407dae9 wxApp decoration to changes list and missed new methods in wxApp section. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex index 2929b04218..785927703f 100644 --- a/docs/latex/wx/app.tex +++ b/docs/latex/wx/app.tex @@ -92,6 +92,15 @@ This can be used for programming event loops, e.g. \helpref{wxApp::Pending}{wxapppending} +\membersection{wxApp::ExitMainLoop}\label{wxappexitmainloop} + +\func{virtual void}{ExitMainLoop}{\void} + +Call this to explicitly exit the main message (event) loop. +You should normally exit the main loop (and the application) by deleting +the top window. + + \membersection{wxApp::FilterEvent}\label{wxappfilterevent} \func{int}{FilterEvent}{\param{wxEvent\& }{event}} @@ -104,15 +113,6 @@ had been already processed (for the former return value) or that it is not going to be processed at all (for the latter one). -\membersection{wxApp::ExitMainLoop}\label{wxappexitmainloop} - -\func{virtual void}{ExitMainLoop}{\void} - -Call this to explicitly exit the main message (event) loop. -You should normally exit the main loop (and the application) by deleting -the top window. - - \membersection{wxApp::GetAppName}\label{wxappgetappname} \constfunc{wxString}{GetAppName}{\void} @@ -150,6 +150,18 @@ otherwise. \helpref{wxApp shutdown overview}{wxappshutdownoverview} +\membersection{wxApp::GetInstance}\label{wxappgetinstance} + +\func{static wxAppConsole *}{GetInstance}{\void} + +Returns the one and only global application object. +Usually \texttt{wxTheApp} is usead instead. + +\wxheading{See also} + +\helpref{wxApp::SetInstance}{wxappsetinstance} + + \membersection{wxApp::GetTopWindow}\label{wxappgettopwindow} \constfunc{virtual wxWindow *}{GetTopWindow}{\void} @@ -622,6 +634,22 @@ deleted. If false, the application will continue to run.} \helpref{wxApp shutdown overview}{wxappshutdownoverview} +\membersection{wxApp::SetInstance}\label{wxappsetinstance} + +\func{static void}{SetInstance}{\param{wxAppConsole* }{app}} + +Allows external code to modify global \texttt{wxTheApp}, but you should really +know what you're doing if you call it. + +\wxheading{Parameters} + +\docparam{app}{Replacement for the global application object.} + +\wxheading{See also} + +\helpref{wxApp::GetInstance}{wxappgetinstance} + + \membersection{wxApp::SetTopWindow}\label{wxappsettopwindow} \func{void}{SetTopWindow}{\param{wxWindow* }{window}} diff --git a/docs/latex/wx/tchanges.tex b/docs/latex/wx/tchanges.tex index 38e812cbe7..feba3e2694 100644 --- a/docs/latex/wx/tchanges.tex +++ b/docs/latex/wx/tchanges.tex @@ -129,15 +129,15 @@ sizer->Add(win); \subsubsection{Less drastic incompatable changes since 2.4.x}\label{24incompatiblelessdrastic} -- no initialization/cleanup can be done in wxApp/~wxApp because they are +- no initialization/cleanup can be done in \helpref{wxApp}{wxappctor}/\helpref{~wxApp}{wxappdtor} because they are now called much earlier/later than before; please move any exiting code - from there to wxApp::OnInit()/OnExit() + from there to \helpref{wxApp::OnInit()}{wxapponinit}/\helpref{OnExit()}{wxapponexit} -- also, OnExit() is not called if OnInit() fails +- also, \helpref{OnExit()}{wxapponexit} is not called if \helpref{OnInit()}{wxapponinit} fails -- finally the program exit code is OnRun() return value, not OnExit() one +- finally the program exit code is \helpref{OnRun()}{wxapponrun} return value, not \helpref{OnExit()}{wxapponexit} one -- wxTheApp can't be assigned to any longer, use wxApp::SetInstance() instead +- \texttt{wxTheApp} can't be assigned to any longer, use \helpref{wxApp::SetInstance()}{wxappsetinstance} instead - wxFileType::GetIcon() returns wxIconLocation, not wxIcon @@ -152,7 +152,7 @@ sizer->Add(win); - (most) controls now inherit parents colours by default, override ShouldInheritColours() to return false if you don't want this to happen -- wxApp::SendIdleEvent() now takes 2 arguments +- \helpref{wxApp::SendIdleEvents()}{wxappsendidleevents} now takes 2 arguments - wxTabView::GetLayers() changed return type from wxList& to wxTabLayerList& (when WXWIN\_COMPATIBILITY\_2\_4 == 0)