missing commit

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 9020ad8b55bcb8d4f5b2c12c992014003533ed4b..12d914ba2a5acae9f6b379e96d77ce4e49f1348d 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -89,6 +89,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_Data = data;
     m_HtmlHelpWin = NULL;
     m_helpController = NULL;
     m_Data = data;
     m_HtmlHelpWin = NULL;
     m_helpController = NULL;

+    m_shouldPreventAppExit = false;

 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)


@@ -139,9 +140,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
     fileMenu->Append(wxID_CLOSE, _("&Close"));
 
     wxMenu* helpMenu = new wxMenu;
     fileMenu->Append(wxID_CLOSE, _("&Close"));
 
     wxMenu* helpMenu = new wxMenu;

-    helpMenu->Append(wxID_ABOUT, _("&About..."));
+    helpMenu->Append(wxID_ABOUT, _("&About"));

     // Ensures we don't get an empty help menu
     // Ensures we don't get an empty help menu

-    helpMenu->Append(wxID_HELP_CONTENTS, _("&About..."));
+    helpMenu->Append(wxID_HELP_CONTENTS, _("&About"));

 
     menuBar->Append(fileMenu,_("&File"));
     menuBar->Append(helpMenu,_("&Help"));
 
     menuBar->Append(fileMenu,_("&File"));
     menuBar->Append(helpMenu,_("&Help"));


@@ -203,7 +204,7 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
     if (m_HtmlHelpWin->GetSplitterWindow() && m_HtmlHelpWin->GetCfgData().navig_on)
         m_HtmlHelpWin->GetCfgData().sashpos = m_HtmlHelpWin->GetSplitterWindow()->GetSashPosition();
 
     if (m_HtmlHelpWin->GetSplitterWindow() && m_HtmlHelpWin->GetCfgData().navig_on)
         m_HtmlHelpWin->GetCfgData().sashpos = m_HtmlHelpWin->GetSplitterWindow()->GetSashPosition();
 

-    if (m_helpController && m_helpController->IsKindOf(CLASSINFO(wxHtmlHelpController)))
+    if (m_helpController && wxDynamicCast(m_helpController, wxHtmlHelpController))

     {
         ((wxHtmlHelpController*) m_helpController)->OnCloseFrame(evt);
     }
     {
         ((wxHtmlHelpController*) m_helpController)->OnCloseFrame(evt);
     }


@@ -246,6 +247,11 @@ void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 }
 #endif // wxUSE_CONFIG
 
 }
 #endif // wxUSE_CONFIG
 

+void wxHtmlHelpFrame::SetShouldPreventAppExit(bool enable)
+{
+    m_shouldPreventAppExit = enable;
+}
+

 #ifdef __WXMAC__
 void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {
 #ifdef __WXMAC__
 void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {