started for unicode text control, in case we will not be able to get the MLTE EchoMod...

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 67726f7456e702e6607e4bbddde2be0c549a3acc..5f0bc3fd68e44db3555a3f40bc13e88cb4953547 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "helpctrl.h"
 #endif
 
 #pragma implementation "helpctrl.h"
 #endif
 


@@ -38,6 +38,12 @@
 #if wxUSE_HELP
     #include "wx/tipwin.h"
 #endif
 #if wxUSE_HELP
     #include "wx/tipwin.h"
 #endif

+    
+
+#if wxUSE_LIBMSPACK
+#include "wx/html/forcelnk.h"
+FORCE_LINK(wxhtml_chm_support)
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
 


@@ -142,6 +148,7 @@ void wxHtmlHelpController::CreateHelpWindow()
 
     m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);
 
     m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);

+

     m_helpFrame->Show(TRUE);
 }
 
     m_helpFrame->Show(TRUE);
 }
 


@@ -187,10 +194,15 @@ bool wxHtmlHelpController::Initialize(const wxString& file)
         {
             actualFilename = dir + filename + wxString(wxT(".hhp"));
             if (!wxFileExists(actualFilename))
         {
             actualFilename = dir + filename + wxString(wxT(".hhp"));
             if (!wxFileExists(actualFilename))

-                return FALSE;
+            {
+#if wxUSE_LIBMSPACK
+                actualFilename = dir + filename + wxString(wxT(".chm"));
+                if (!wxFileExists(actualFilename))
+#endif
+                    return false;
+            }

         }
     }
         }
     }

-

     return AddBook(wxFileName(actualFilename));
 }
 
     return AddBook(wxFileName(actualFilename));
 }
 


@@ -319,10 +331,11 @@ bool wxHtmlHelpController::DisplayIndex()
     return success;
 }
 
     return success;
 }
 

-bool wxHtmlHelpController::KeywordSearch(const wxString& keyword)
+bool wxHtmlHelpController::KeywordSearch(const wxString& keyword,
+                                         wxHelpSearchMode mode)

 {
     CreateHelpWindow();
 {
     CreateHelpWindow();

-    bool success = m_helpFrame->KeywordSearch(keyword);
+    bool success = m_helpFrame->KeywordSearch(keyword, mode);

     AddGrabIfNeeded();
     return success;
 }
     AddGrabIfNeeded();
     return success;
 }