reverted Julian's r44600, it broke help window behavior so that it prevented apps from closing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
664d172947
commit
fe828a03f4
@ -109,7 +109,7 @@ public:
|
||||
|
||||
// we don't want to prevent the app from closing just because a help window
|
||||
// remains opened
|
||||
virtual bool ShouldPreventAppExit() const;
|
||||
virtual bool ShouldPreventAppExit() const { return false; }
|
||||
|
||||
protected:
|
||||
void Init(wxHtmlHelpData* data = NULL);
|
||||
|
@ -84,8 +84,6 @@ bool MyApp::OnInit()
|
||||
|
||||
help -> DisplayContents();
|
||||
|
||||
SetTopWindow(help->GetFrame());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -55,7 +55,6 @@
|
||||
#include "wx/fontenum.h"
|
||||
#include "wx/artprov.h"
|
||||
#include "wx/spinctrl.h"
|
||||
#include "wx/app.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
|
||||
|
||||
@ -246,11 +245,4 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||
}
|
||||
#endif
|
||||
|
||||
// we don't want to prevent the app from closing just because a help window
|
||||
// remains opened
|
||||
bool wxHtmlHelpFrame::ShouldPreventAppExit() const
|
||||
{
|
||||
return (wx_const_cast(wxHtmlHelpFrame*, this) == wxTheApp->GetTopWindow());
|
||||
}
|
||||
|
||||
#endif // wxUSE_WXHTML_HELP
|
||||
|
@ -219,8 +219,6 @@ bool hvApp::OnInit()
|
||||
|
||||
m_helpController->DisplayContents();
|
||||
|
||||
SetTopWindow(m_helpController->GetFrame());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user