X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/html/helpctrl.cpp?ds=sidebyside

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index e25e606060..6d6583db50 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -28,34 +28,56 @@
 #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)
+EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
 END_EVENT_TABLE()
+#endif
 
-wxHtmlHelpController::wxHtmlHelpController()
+wxHtmlHelpController::wxHtmlHelpController(int style)
 {
     m_helpFrame = NULL;
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
     m_titleFormat = _("Help: %s");
+    m_FrameStyle = style;
 }
 
 wxHtmlHelpController::~wxHtmlHelpController()
 {
     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)
 {
     m_titleFormat = title;
     if (m_helpFrame)
-	m_helpFrame->SetTitleFormat(title);
+        m_helpFrame->SetTitleFormat(title);
 }
 
+
 bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 {
     wxBusyCursor cur;
@@ -63,30 +85,48 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
     wxBusyInfo* busy = NULL;
     wxString info;
     if (show_wait_msg) {
-	info.Printf(_("Adding book %s"), book.c_str());
-	busy = new wxBusyInfo(info);
+        info.Printf(_("Adding book %s"), book.c_str());
+        busy = new wxBusyInfo(info);
     }
 #endif
     bool retval = m_helpData.AddBook(book);
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
-	delete busy;
-#endif
+        delete busy;
+#endif 
     return retval;
 }
 
-void wxHtmlHelpController::CreateHelpWindow(bool show_progress)
+
+
+wxHtmlHelpFrame *wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
+{
+    return new wxHtmlHelpFrame(data);
+}
+
+
+void wxHtmlHelpController::CreateHelpWindow()
 {
     if (m_helpFrame) {
-	m_helpFrame->Raise();
-	return;
+        m_helpFrame->Raise();
+        return ;
     }
-    m_helpFrame = new wxHtmlHelpFrame(&m_helpData);
-    m_helpFrame->PushEventHandler(this);
+
+    if (m_Config == NULL) 
+    {
+        m_Config = wxConfigBase::Get(FALSE);
+        if (m_Config != NULL)
+            m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
+    }
+
+    m_helpFrame = CreateHelpFrame(&m_helpData);
+    m_helpFrame->SetController(this);
+//    m_helpFrame->PushEventHandler(this);
+
     if (m_Config)
-	m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
-    m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME);
-    m_helpFrame->RefreshLists(show_progress);
+        m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
+
+    m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);
     m_helpFrame->Show(TRUE);
 }
@@ -96,14 +136,91 @@ void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString&
     /* should not be called by the user; call UseConfig, and the controller
      * will do the rest */
     if (m_helpFrame)
-	m_helpFrame->ReadCustomization(cfg, path);
+        m_helpFrame->ReadCustomization(cfg, path);
 }
 
 void wxHtmlHelpController::WriteCustomization(wxConfigBase* cfg, const wxString& path)
 {
     /* typically called by the controllers OnCloseFrame handler */
     if (m_helpFrame)
-	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(_("/"));
+
+    // Try to find a suitable file
+    wxString actualFilename = dir + filename + wxString(_(".zip"));
+    if (!wxFileExists(actualFilename))
+    {
+        actualFilename = dir + filename + wxString(_(".htb"));
+        if (!wxFileExists(actualFilename))
+        {
+            actualFilename = dir + filename + wxString(_(".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