Corrected (maybe) the object.h token syntax; corrected typo in makefile.g95

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index abac8364523d8a942edaa905b5eb64763da25e2c..66f90962401e12212e6de8bbed2032ebc939cc3a 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -40,6 +40,10 @@
     #include   <unistd.h>
 #endif
 
+#ifdef __WXMSW__
+#include <windows.h>
+#endif
+
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 /**
@@ -77,7 +81,7 @@ void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 }
 
 bool
-wxExtHelpController::DisplayHelp(wxString const &relativeURL)
+wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 {
    wxBusyCursor b; // display a busy cursor
 
@@ -85,7 +89,7 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 #if defined(__WXMSW__)
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
-   bool bOk = (int)ShellExecute(NULL, "open", url,
+   bool bOk = (int)ShellExecute(NULL, wxT("open"), url.c_str(),
                                 NULL, NULL, SW_SHOWNORMAL ) > 32;
    if ( !bOk )
    {
@@ -94,7 +98,9 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    }
    else
       return true;
+
 #elif  defined(__WXPM__)
+
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 //   will have to fix for OS/2, later.....DW
@@ -107,8 +113,16 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 //   }
 //   else
       return TRUE;
-#else
-   // assume UNIX
+
+#elif defined(__DOS__)
+
+   wxString command;
+   command = m_BrowserName;
+   command << wxT(" file://")
+           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
+   return wxExecute(command) != 0;
+
+#else // UNIX
    wxString command;
 
    if(m_BrowserIsNetscape) // try re-loading first