This should work on SuSE and Mandrake icon themes.

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 1748fef73d74fc28b183dec96ab2fdabd5cf782c..2900d99d31ec39789cb912f13e478878e38c6db5 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)
 


@@ -187,10 +193,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));
 }
 


@@ -271,7 +282,7 @@ void wxHtmlHelpController::AddGrabIfNeeded()
     
     // Check if there are any modal windows present,
     // in which case we need to add a grab.
     
     // Check if there are any modal windows present,
     // in which case we need to add a grab.

-    for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst();
+    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -319,10 +330,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;
 }