X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..e269a9be19a8c454fee444500447db925992f86b:/src/html/helpctrl.cpp?ds=inline

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 72c82d2773..ad43374bd6 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -20,12 +20,14 @@
 #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/wx.h"
 #include "wx/busyinfo.h"
 
 #if wxUSE_HELP
@@ -193,7 +195,7 @@ bool wxHtmlHelpController::DisplaySection(int sectionNo)
 
 bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint& WXUNUSED(pos))
 {
-#if wxUSE_HELP
+#if wxUSE_TIPWINDOW
     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)
@@ -211,7 +213,8 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
 
         return TRUE;
     }
-#endif
+#endif // wxUSE_TIPWINDOW
+
     return FALSE;
 }
 
@@ -246,20 +249,5 @@ bool wxHtmlHelpController::Quit()
     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