Fixed a crash when deleting the last timer

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 840ae94fa0492c76db07c1b2e60a0acf94787681..1bf7d2b43dbb2dffbbabb7c7d33c3c9abfd2b5f3 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpext.cpp
+// Name:        src/generic/helpext.cpp

 // Purpose:     an external help controller for wxWidgets
 // Author:      Karsten Ballueder
 // Modified by:
 // Purpose:     an external help controller for wxWidgets
 // Author:      Karsten Ballueder
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#   pragma implementation "wxexthlp.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -22,7 +18,6 @@
 #if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
 
 #ifndef WX_PRECOMP
 #if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
 
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/list.h"


@@ -43,6 +38,10 @@
     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+#ifdef __WINDOWS__
+#include "wx/msw/mslu.h"
+#endif
+

 #ifdef __WXMSW__
 #include <windows.h>
 #include "wx/msw/winundef.h"
 #ifdef __WXMSW__
 #include <windows.h>
 #include "wx/msw/winundef.h"


@@ -74,7 +73,8 @@ IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase)
    and a file mapping numerical Section numbers to relative URLS.
 */
 
    and a file mapping numerical Section numbers to relative URLS.
 */
 

-wxExtHelpController::wxExtHelpController()
+wxExtHelpController::wxExtHelpController(wxWindow* parentWindow):
+    wxHelpControllerBase(parentWindow)

 {
    m_MapList = (wxList*) NULL;
    m_NumOfEntries = 0;
 {
    m_MapList = (wxList*) NULL;
    m_NumOfEntries = 0;


@@ -125,7 +125,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
    }
 
    return true;
    }
 
    return true;

-#elif  defined(__WXPM__)
+#elif  defined(__OS2__)

 
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');


@@ -237,9 +237,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       file = ifile;
       if(! wxIsAbsolutePath(file))
       {
       file = ifile;
       if(! wxIsAbsolutePath(file))
       {

-         wxChar* f = wxGetWorkingDirectory();
-         file = f;
-         delete[] f; // wxGetWorkingDirectory returns new memory
+         file = wxGetCwd();

 #ifdef __WXMAC__
          file << ifile;
 #else
 #ifdef __WXMAC__
          file << ifile;
 #else


@@ -259,7 +257,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();

-         if(wxPathExists(newfile))
+         if(wxDirExists(newfile))

             file = newfile;
          else
          {
             file = newfile;
          else
          {


@@ -267,13 +265,13 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
             while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
             while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);

-            if(wxPathExists(newfile))
+            if(wxDirExists(newfile))

                file = newfile;
          }
       }
 #endif
 
                file = newfile;
          }
       }
 #endif
 

-      if(! wxPathExists(file))
+      if(! wxDirExists(file))

          return false;
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
          return false;
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;


@@ -347,7 +345,7 @@ wxExtHelpController::DisplayContents()
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))
       file = file.BeforeLast(wxT('#'));
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))
       file = file.BeforeLast(wxT('#'));

-   if(contents.Length() && wxFileExists(file))
+   if(contents.length() && wxFileExists(file))

       rc = DisplaySection(CONTENTS_ID);
 
    // if not found, open homemade toc:
       rc = DisplaySection(CONTENTS_ID);
 
    // if not found, open homemade toc:


@@ -465,4 +463,3 @@ void wxExtHelpController::OnQuit()
 
 
 #endif // wxUSE_HELP
 
 
 #endif // wxUSE_HELP

-