Changes for wxOGL since wxFatalError has been deprecated.

[wxWidgets.git] / src / generic / helpwxht.cpp

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 955dcd87e8f2d31fdf5fd018d3390b2c1ef7a0bf..0ee358cc5d350438540aa32f2824b76510b993a6 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -19,15 +19,16 @@
 #   pragma hdrstop
 #endif
 
-#if wxUSE_HTML
+#if wxUSE_WXHTML_HELP
 
 #ifndef WX_PRECOMP
-#   include "wx/string.h"
-#   include "wx/utils.h"
-#   include "wx/list.h"
-#   include "wx/intl.h"
-#   include "wx/layout.h"
-#   include "wx/combobox.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/list.h"
+    #include "wx/intl.h"
+    #include "wx/layout.h"
+    #include "wx/combobox.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/helpbase.h"
@@ -44,6 +45,10 @@
 #   include   <unistd.h>
 #endif
 
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
 IMPLEMENT_CLASS(wxHelpControllerHtml, wxHTMLHelpControllerBase)
 
 /**
@@ -130,7 +135,7 @@ wxHelpFrame::OnButton(wxCommandEvent &ev)
    else if(id == m_IdSearch)
    {
       wxString str = m_combo->GetValue();
-      if(m_combo->FindString(str) == -1 && m_combo->Number() < MAX_COMBO_ENTRIES)
+      if(m_combo->FindString(str) == -1 && m_combo->GetCount() < MAX_COMBO_ENTRIES)
          m_combo->Append(str);
       m_controller->KeywordSearch(str);
    }
@@ -266,12 +271,16 @@ wxHelpControllerHtml::~wxHelpControllerHtml(void)
 #endif
 
 bool
-wxHelpControllerHtml::DisplayHelp(wxString const &relativeURL)
+wxHelpControllerHtml::DisplayHelp(const wxString &relativeURL)
 {
    wxBusyCursor b; // display a busy cursor
 
    wxString url;
-   url << m_MapFile << SEP<< relativeURL;
+   wxString mapfileurl = m_MapFile ;
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+    mapfileurl = wxMac2UnixFilename(m_MapFile) ;
+#endif
+   url << mapfileurl << SEP<< relativeURL;
    if(! m_Frame || m_NewFrameEachTime)
    {
       m_Frame = new wxHelpFrame(NULL, -1, m_FrameTitle,
@@ -314,4 +323,5 @@ wxHelpControllerHtml::GetFrameParameters(wxSize *size,
    return m_Frame;
 }
 
-#endif // wxUSE_HTML
+#endif // wxUSE_WXHTML_HELP
+