Don't do the wx cleanup if wxPython didn't do the initialization.

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 72c82d2773e841d5444c153f29e70624a24f43c4..dbbf32c4742c1fa23792f81f34ce71e200a4f86e 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -20,12 +20,14 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
+#if wxUSE_WXHTML_HELP

 
 

-#if wxUSE_HTML && wxUSE_STREAMS
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/intl.h"
+#endif // WX_PRECOMP

 
 #include "wx/html/helpctrl.h"
 
 #include "wx/html/helpctrl.h"

-#include "wx/wx.h"

 #include "wx/busyinfo.h"
 
 #if wxUSE_HELP
 #include "wx/busyinfo.h"
 
 #if wxUSE_HELP


@@ -94,6 +96,8 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
     if (show_wait_msg)
         delete busy;
 #endif
     if (show_wait_msg)
         delete busy;
 #endif

+    if (m_helpFrame) 
+        m_helpFrame->RefreshLists();

     return retval;
 }
 
     return retval;
 }
 


@@ -193,7 +197,7 @@ bool wxHtmlHelpController::DisplaySection(int sectionNo)
 
 bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint& WXUNUSED(pos))
 {
 
 bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint& WXUNUSED(pos))
 {

-#if wxUSE_HELP
+#if wxUSE_TIPWINDOW

     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)
     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)


@@ -211,7 +215,8 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
 
         return TRUE;
     }
 
         return TRUE;
     }

-#endif
+#endif // wxUSE_TIPWINDOW
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -246,20 +251,5 @@ bool wxHtmlHelpController::Quit()
     return TRUE;
 }
 
     return TRUE;
 }
 

-// Sets the specified book or all books to have the given base path
-void wxHtmlHelpController::SetBookBasePath(const wxString& basePath, int which)
-{
-    size_t i;
-    for (i = 0; i < m_helpData.GetBookRecArray().Count(); i++ )
-    {
-        if (i == (size_t) which || which == -1)
-        {
-            wxHtmlBookRecord& book = m_helpData.GetBookRecArray()[i];
-            book.SetBasePath(basePath);
-        }
-        if (i == (size_t) which)
-            return;
-    }
-}
+#endif // wxUSE_WXHTML_HELP

 
 

-#endif