wxMenu compile fix

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 2b79a863b241785237fe9f99282c691a8fcb0e14..817b73c401a2504c77c3b840e0a30637f501b07f 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -1,31 +1,42 @@
-/*-*- 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
 
 #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

 
 

-struct wxBusyCursor
-{
-   wxBusyCursor() { wxBeginBusyCursor(); }
-   ~wxBusyCursor() { wxEndBusyCursor(); }
-};
+#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)
    
 
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
    


@@ -57,35 +68,58 @@ wxExtHelpController::SetBrowser(wxString const & browsername, bool isNetscape)
    m_BrowserIsNetscape = isNetscape;
 }
 
    m_BrowserIsNetscape = isNetscape;
 }
 

+// Set viewer: new, generic name for SetBrowser
+void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
+{
+    SetBrowser(viewer, ((flags & wxHELP_NETSCAPE) == wxHELP_NETSCAPE));
+}
+

 bool
 wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 {
    wxBusyCursor b; // display a busy cursor
 bool
 wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 {
    wxBusyCursor b; // display a busy cursor

+
+
+#ifdef __WXMSW__
+   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());
+      return false;
+   }
+   else
+      return true;
+#else
+   // assume UNIX

    wxString command;
 
    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);
    wxString command;
 
    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);

-      lockfile << WXEXTHELP_SEPARATOR << ".netscape/lock";
+      lockfile << WXEXTHELP_SEPARATOR << _T(".netscape/lock");

       struct stat statbuf;
       struct stat statbuf;

-      if(lstat(lockfile.c_str(), &statbuf) == 0)
+      if(lstat(lockfile.fn_str(), &statbuf) == 0)

       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))
       {
          long success;
       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))
       {
          long success;

-         command << m_BrowserName << " -remote openURL("
-                 << "file://" << m_MapFile
-                 << WXEXTHELP_SEPARATOR << relativeURL << ")"; 
+         command << m_BrowserName << _T(" -remote openURL(")
+                 << _T("file://") << m_MapFile
+                 << WXEXTHELP_SEPARATOR << relativeURL << _T(")"); 

          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
             return TRUE;
       }
    }
    command = m_BrowserName;
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
             return TRUE;
       }
    }
    command = m_BrowserName;

-   command << " file://"
+   command << _T(" file://")

            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL; 
    return wxExecute(command) != 0; 
            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL; 
    return wxExecute(command) != 0; 

+#endif

 }
 
 
 }