use wxConvLibc, not wxConvCurrent, with regerror()

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index c3a082efb9945f366156daa03acc3c514bfec1f5..09ca6f4727b04b83609bc53d97dfef093931da72 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -55,6 +55,7 @@
 #include "wx/fontenum.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
+#include "wx/app.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 
@@ -237,4 +238,11 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& 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