AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reverted Julian's r44600, it broke help window behavior so that it prevented apps from closing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2008-03-13 23:58:32 +00:00
parent 664d172947
commit fe828a03f4
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/html/helpfrm.h
View File

@ -109,7 +109,7 @@ public:
// we don't want to prevent the app from closing just because a help window // we don't want to prevent the app from closing just because a help window
// remains opened // remains opened
virtual bool ShouldPreventAppExit() const; virtual bool ShouldPreventAppExit() const { return false; }
protected: protected:
void Init(wxHtmlHelpData* data = NULL); void Init(wxHtmlHelpData* data = NULL);

2
samples/html/helpview/helpview.cpp
View File

@ -84,8 +84,6 @@ bool MyApp::OnInit()
help -> DisplayContents(); help -> DisplayContents();
SetTopWindow(help->GetFrame());
return true; return true;
} }

8
src/html/helpfrm.cpp
View File

@ -55,7 +55,6 @@
#include "wx/fontenum.h" #include "wx/fontenum.h"
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
#include "wx/app.h"
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
@ -246,11 +245,4 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
} }
#endif #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 #endif // wxUSE_WXHTML_HELP

2
utils/helpview/src/helpview.cpp
View File

@ -219,8 +219,6 @@ bool hvApp::OnInit()
m_helpController->DisplayContents(); m_helpController->DisplayContents();
SetTopWindow(m_helpController->GetFrame());
return true; return true;
} }