reverted the previous fix, it's no longer needed now after the change to the default...

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 31a5df2dd6754da78967e07c0476a8a0a180080a..ad43374bd6f255454457e1cddb9689cb94360d14 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


@@ -83,7 +85,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 #if wxUSE_BUSYINFO
     wxBusyInfo* busy = NULL;
     wxString info;
 #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);
     {
         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;
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;

-#endif 
+#endif

     return retval;
 }
 
     return retval;
 }
 


@@ -113,7 +115,7 @@ void wxHtmlHelpController::CreateHelpWindow()
         return ;
     }
 
         return ;
     }
 

-    if (m_Config == NULL) 
+    if (m_Config == NULL)

     {
         m_Config = wxConfigBase::Get(FALSE);
         if (m_Config != NULL)
     {
         m_Config = wxConfigBase::Get(FALSE);
         if (m_Config != NULL)


@@ -193,7 +195,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,10 +213,9 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
 
         return TRUE;
     }
 
         return TRUE;
     }

+#endif // wxUSE_TIPWINDOW

 
     return FALSE;
 
     return FALSE;

-#endif
-    return FALSE;    

 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,
 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,


@@ -248,5 +249,5 @@ bool wxHtmlHelpController::Quit()
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif // wxUSE_WXHTML_HELP

 
 

-#endif