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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 13816fa3c1d52403ed9bbf8427957b0409ec68b3..c9bae539a0c592b0bab53ef225fa2451bc93f9ce 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -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);

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 238deea26a2f5b6d1628266571cd7ecde9fe8edf..3cb2b9bc4d25aa92c196f62cac1f653432653afa 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -84,8 +84,6 @@ bool MyApp::OnInit()
 
     help -> DisplayContents();
 
-    SetTopWindow(help->GetFrame());
-
     return true;
 }
 

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index ea22fa9b6edb0bb7b02e0997d031529795f8c29e..9ce75d64353a27376dc61b087bca006345aea979 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -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

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 68991f746792e1b05f1fef5e15a2feb942b3e183..72b3daa6a34c2e2f4b5fc9ad9725be498f3059a3 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -219,8 +219,6 @@ bool hvApp::OnInit()
 
     m_helpController->DisplayContents();
 
-    SetTopWindow(m_helpController->GetFrame());
-
     return true;
 }