Added OS/2 patches to wxGTK.

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 2b79a863b241785237fe9f99282c691a8fcb0e14..43b56b8b3529fd0fe21d7661c622ddd2dd9a5ff3 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -20,13 +20,6 @@
 #include   <sys/stat.h>
 #include   <unistd.h>
 
 #include   <sys/stat.h>
 #include   <unistd.h>
 

-
-struct wxBusyCursor
-{
-   wxBusyCursor() { wxBeginBusyCursor(); }
-   ~wxBusyCursor() { wxEndBusyCursor(); }
-};
-

 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
    
 /**
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
    
 /**


@@ -57,6 +50,12 @@ 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)
 {
 bool
 wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 {


@@ -67,23 +66,23 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);
    {
       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; 
 }