X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/673dfcfac1a56da3cdcedecae59e327613ca2f66..9cf99fc093f9c45b6b5d8d8b357699d826c9916a:/src/html/helpctrl.cpp

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 31a5df2dd6..e513a50f63 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
@@ -83,7 +85,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 #if wxUSE_BUSYINFO
     wxBusyInfo* busy = NULL;
     wxString info;
-    if (show_wait_msg) 
+    if (show_wait_msg)
     {
         info.Printf(_("Adding book %s"), book.c_str());
         busy = new wxBusyInfo(info);
@@ -93,7 +95,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;
-#endif 
+#endif
     return retval;
 }
 
@@ -113,7 +115,7 @@ void wxHtmlHelpController::CreateHelpWindow()
         return ;
     }
 
-    if (m_Config == NULL) 
+    if (m_Config == NULL)
     {
         m_Config = wxConfigBase::Get(FALSE);
         if (m_Config != NULL)
@@ -211,10 +213,8 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
 
         return TRUE;
     }
-
-    return FALSE;
 #endif
-    return FALSE;    
+    return FALSE;
 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,
@@ -248,5 +248,5 @@ bool wxHtmlHelpController::Quit()
     return TRUE;
 }
 
+#endif // wxUSE_WXHTML_HELP
 
-#endif