fixed (rare but fatal) bug in wxWindowDisabler

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 213702353480c3115a3e639c52360ddeb945a307..af0ba923d872b6e8064983e84a2046660760f45a 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -28,11 +28,13 @@
 #include "wx/wx.h"
 #include "wx/busyinfo.h"
 
 #include "wx/wx.h"
 #include "wx/busyinfo.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)

 
 

+#if 0

 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
 EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
 EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
 END_EVENT_TABLE()

+#endif

 
 wxHtmlHelpController::wxHtmlHelpController(int style)
 {
 
 wxHtmlHelpController::wxHtmlHelpController(int style)
 {


@@ -47,7 +49,25 @@ wxHtmlHelpController::~wxHtmlHelpController()
 {
     WriteCustomization(m_Config, m_ConfigRoot);
     if (m_helpFrame)
 {
     WriteCustomization(m_Config, m_ConfigRoot);
     if (m_helpFrame)

-        m_helpFrame->Close();
+        DestroyHelpWindow();
+}
+
+
+void wxHtmlHelpController::DestroyHelpWindow()
+{
+    //if (m_Config) WriteCustomization(m_Config, m_ConfigRoot);
+    if (m_helpFrame)
+        m_helpFrame->Destroy();
+}
+
+void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
+{
+    evt.Skip();
+
+    OnQuit();
+
+    m_helpFrame->SetController((wxHelpControllerBase*) NULL);
+    m_helpFrame = NULL;

 }
 
 void wxHtmlHelpController::SetTitleFormat(const wxString& title)
 }
 
 void wxHtmlHelpController::SetTitleFormat(const wxString& title)


@@ -77,6 +97,14 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
     return retval;
 }
 
     return retval;
 }
 

+
+
+wxHtmlHelpFrame *wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
+{
+    return new wxHtmlHelpFrame(data);
+}
+
+

 void wxHtmlHelpController::CreateHelpWindow()
 {
     if (m_helpFrame) {
 void wxHtmlHelpController::CreateHelpWindow()
 {
     if (m_helpFrame) {


@@ -91,8 +119,9 @@ void wxHtmlHelpController::CreateHelpWindow()
             m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
     }
 
             m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
     }
 

-    m_helpFrame = new wxHtmlHelpFrame(&m_helpData);
-    m_helpFrame->PushEventHandler(this);
+    m_helpFrame = CreateHelpFrame(&m_helpData);
+    m_helpFrame->SetController(this);
+//    m_helpFrame->PushEventHandler(this);

 
     if (m_Config)
         m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
 
     if (m_Config)
         m_helpFrame->UseConfig(m_Config, m_ConfigRoot);


@@ -117,4 +146,81 @@ void wxHtmlHelpController::WriteCustomization(wxConfigBase* cfg, const wxString&
         m_helpFrame->WriteCustomization(cfg, path);
 }
 
         m_helpFrame->WriteCustomization(cfg, path);
 }
 

+void wxHtmlHelpController::UseConfig(wxConfigBase *config, const wxString& rootpath)
+{
+    m_Config = config;
+    m_ConfigRoot = rootpath;
+    if (m_helpFrame) m_helpFrame -> UseConfig(config, rootpath);
+    ReadCustomization(config, rootpath);
+}
+
+//// Backward compatibility with wxHelpController API
+
+bool wxHtmlHelpController::Initialize(const wxString& file)
+{
+    wxString dir, filename, ext;
+    wxSplitPath(file, & dir, & filename, & ext);
+
+    if (!dir.IsEmpty())
+        dir = dir + wxString(wxT("/"));
+
+    // Try to find a suitable file
+    wxString actualFilename = dir + filename + wxString(wxT(".zip"));
+    if (!wxFileExists(actualFilename))
+    {
+        actualFilename = dir + filename + wxString(wxT(".htb"));
+        if (!wxFileExists(actualFilename))
+        {
+            actualFilename = dir + filename + wxString(wxT(".hhp"));
+            if (!wxFileExists(actualFilename))
+                return FALSE;
+        }
+    }
+
+    return AddBook(actualFilename);
+}
+
+bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
+{
+    // Don't reload the file or we'll have it appear again, presumably.
+    return TRUE;
+}
+
+bool wxHtmlHelpController::DisplaySection(int sectionNo)
+{
+    return Display(sectionNo);
+}
+
+void wxHtmlHelpController::SetFrameParameters(const wxString& title,
+                                   const wxSize& size,
+                                   const wxPoint& pos,
+                                   bool WXUNUSED(newFrameEachTime))
+{
+    SetTitleFormat(title);
+    if (m_helpFrame)
+    {
+        m_helpFrame->SetSize(pos.x, pos.y, size.x, size.y);
+    }
+}
+
+wxFrame* wxHtmlHelpController::GetFrameParameters(wxSize *size,
+                                   wxPoint *pos,
+                                   bool *newFrameEachTime)
+{
+    if (newFrameEachTime)
+        (* newFrameEachTime) = FALSE;
+    if (size && m_helpFrame)
+        (* size) = m_helpFrame->GetSize();
+    if (pos && m_helpFrame)
+        (* pos) = m_helpFrame->GetPosition();
+    return m_helpFrame;
+}
+
+bool wxHtmlHelpController::Quit()
+{
+    DestroyHelpWindow();
+    return TRUE;
+}
+
+

 #endif
 #endif