Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 853dbc343a33c1f0b550ca8ac6c80b9ce84b6317..5e68f9535225df18aacc58d0563734f56e7919d8 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -4,14 +4,13 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik

-// Created:
-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "helpctrl.h"
+#pragma implementation

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -32,62 +31,97 @@
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)

-    EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
+EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxHtmlHelpController::wxHtmlHelpController()
+wxHtmlHelpController::wxHtmlHelpController(int style)

 {
     m_helpFrame = NULL;
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
     m_titleFormat = _("Help: %s");
 {
     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)
 }
 
 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(); 
+
+    m_helpFrame = NULL; 
+}
+
+

 void wxHtmlHelpController::SetTitleFormat(const wxString& title)
 {
     m_titleFormat = title;
     if (m_helpFrame)
 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;
 #if wxUSE_BUSYINFO
 bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 {
     wxBusyCursor cur;
 #if wxUSE_BUSYINFO

-    wxBusyInfo* busy;
+    wxBusyInfo* busy = NULL;

     wxString info;
     if (show_wait_msg) {
     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)
     }
 #endif
     bool retval = m_helpData.AddBook(book);
 #if wxUSE_BUSYINFO
     if (show_wait_msg)

-       delete busy;
-#endif
+        delete busy;
+#endif 

     return retval;
 }
 
     return retval;
 }
 

-void wxHtmlHelpController::CreateHelpWindow(bool show_progress)
+
+
+wxHtmlHelpFrame *wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
+{
+    return new wxHtmlHelpFrame(data);
+}
+
+
+void wxHtmlHelpController::CreateHelpWindow()

 {
     if (m_helpFrame) {
 {
     if (m_helpFrame) {

-       m_helpFrame->Raise();
-       return;
+        m_helpFrame->Raise();
+        return ;

     }
     }

-    m_helpFrame = new wxHtmlHelpFrame(&m_helpData);
+
+    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->PushEventHandler(this);
     m_helpFrame->PushEventHandler(this);

+

     if (m_Config)
     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);
 }
     m_helpFrame->SetTitleFormat(m_titleFormat);
     m_helpFrame->Show(TRUE);
 }


@@ -97,14 +131,14 @@ 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)
     /* 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)
 }
 
 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);

 }
 
 #endif
 }
 
 #endif