X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e5fefdf863aa639a1f763f88232e2ef3e598e15..e841d48627e88f88a95f587a0afbde974adc5bf8:/src/generic/helpext.cpp

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index aba6fd516b..057d510387 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -1,27 +1,47 @@
-/*-*- c++ -*-********************************************************
- * helpext.cpp - an external help controller for wxWindows          *
- *                                                                  *
- * (C) 1999 by Karsten Ballüder (Ballueder@usa.net)                 *
- *                                                                  *
- * $Id$
- *******************************************************************/
+/////////////////////////////////////////////////////////////////////////////
+// Name:        helpext.cpp
+// Purpose:     an external help controller for wxWindows
+// Author:      Karsten Ballueder
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Karsten Ballueder
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifdef __GNUG__
 #   pragma implementation "wxexthlp.h"
 #endif
 
-#include   "wx/setup.h"
-#include   "wx/helpbase.h"
-#include   "wx/generic/helpext.h"
-#include   "wx/string.h"
-#include   "wx/utils.h"
-#include   "wx/list.h"
-#include   <stdio.h>
-#include   <ctype.h>
-#include   <sys/stat.h>
-#include   <unistd.h>
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_HELP
+
+#ifndef WX_PRECOMP
+    #include "wx/setup.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/list.h"
+    #include "wx/intl.h"
+#endif
+
+#include "wx/helpbase.h"
+#include "wx/generic/helpext.h"
+
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/stat.h>
+
+#ifndef __WINDOWS__
+    #include   <unistd.h>
+#endif
 
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
-   
+
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation
@@ -63,8 +83,10 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 
 
 #ifdef __WXMSW__
-   bool bOk = (int)ShellExecute(NULL, "open", relativeURL.c_str(),
-                           NULL, NULL, SW_SHOWNORMAL ) > 32;
+   wxString url;
+   url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
+   bool bOk = (int)ShellExecute(NULL, "open", url,
+                                NULL, NULL, SW_SHOWNORMAL ) > 32;
    if ( !bOk )
    {
       wxLogSysError(_("Cannot open URL '%s'"), relativeURL.c_str());
@@ -89,7 +111,7 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
          long success;
          command << m_BrowserName << _T(" -remote openURL(")
                  << _T("file://") << m_MapFile
-                 << WXEXTHELP_SEPARATOR << relativeURL << _T(")"); 
+                 << WXEXTHELP_SEPARATOR << relativeURL << _T(")");
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
             return TRUE;
@@ -97,9 +119,10 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    }
    command = m_BrowserName;
    command << _T(" file://")
-           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL; 
-   return wxExecute(command) != 0; 
+           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
+   return wxExecute(command) != 0;
 #endif
 }
 
+#endif // wxUSE_HELP