ignore clicks on a toolbar but outside any button

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 817b73c401a2504c77c3b840e0a30637f501b07f..9f165b3a5040ee86a72b2debc39174bfa9d3a414 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_HELP
+

 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/string.h"


@@ -34,12 +36,21 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
 #include <ctype.h>
 #include <sys/stat.h>
 

-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__OS2__)

     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+#ifdef __WXMSW__
+#include <windows.h>
+#endif
+

 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)

-   
+
+/// Name of environment variable to set help browser.
+#define   WXEXTHELP_ENVVAR_BROWSER   "WX_HELPBROWSER"
+/// Is browser a netscape browser?
+#define   WXEXTHELP_ENVVAR_BROWSERISNETSCAPE "WX_HELPBROWSER_NS"
+

 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation


@@ -75,15 +86,15 @@ void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 }
 
 bool
 }
 
 bool

-wxExtHelpController::DisplayHelp(wxString const &relativeURL)
+wxExtHelpController::DisplayHelp(const wxString &relativeURL)

 {
    wxBusyCursor b; // display a busy cursor
 
 
 {
    wxBusyCursor b; // display a busy cursor
 
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
    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 )
    {
                                 NULL, NULL, SW_SHOWNORMAL ) > 32;
    if ( !bOk )
    {


@@ -92,34 +103,64 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    }
    else
       return true;
    }
    else
       return true;

-#else
-   // assume UNIX
+
+#elif  defined(__WXPM__)
+
+   wxString url;
+   url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
+//   will have to fix for OS/2, later.....DW
+//   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;
+
+#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
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);
    wxString command;
 
    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);

-      lockfile << WXEXTHELP_SEPARATOR << _T(".netscape/lock");
+#ifdef __VMS__
+      lockfile << WXEXTHELP_SEPARATOR << wxT(".netscape]lock.");
+      struct stat statbuf;
+      if(stat(lockfile.fn_str(), &statbuf) == 0)
+#else
+      lockfile << WXEXTHELP_SEPARATOR << wxT(".netscape/lock");

       struct stat statbuf;
       if(lstat(lockfile.fn_str(), &statbuf) == 0)
       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))
       struct stat statbuf;
       if(lstat(lockfile.fn_str(), &statbuf) == 0)
       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))

+#endif

       {
          long success;
       {
          long success;

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

          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 << _T(" file://")
-           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL; 
-   return wxExecute(command) != 0; 
+   command << wxT(" file://")
+           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
+   return wxExecute(command) != 0;

 #endif
 }
 
 #endif
 }
 

+#endif // wxUSE_HELP