added wxListCtrl::DeleteAllColumns()

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index caf3afba317cc99515968065079d436ba434d3ea..a785361d421b481afcd2cae3ded002e5b77ec33c 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -52,6 +52,7 @@ wxExtHelpController::wxExtHelpController(void)
    m_MapList = NULL;
    m_BrowserName = WXEXTHELP_DEFAULTBROWSER;
    m_BrowserIsNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE;
    m_MapList = NULL;
    m_BrowserName = WXEXTHELP_DEFAULTBROWSER;
    m_BrowserIsNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE;

+   m_NumOfEntries = 0;

 
    char *browser = getenv(WXEXTHELP_ENVVAR_BROWSER);
    if(browser)
 
    char *browser = getenv(WXEXTHELP_ENVVAR_BROWSER);
    if(browser)


@@ -104,7 +105,7 @@ wxExtHelpController::Initialize(const wxString& file)
 
   
 bool
 
   
 bool

-wxExtHelpController::LoadFile(const wxString& ifile = "")
+wxExtHelpController::LoadFile(const wxString& ifile)

 {
    wxString mapFile, file, url, doc;
    int id,i,len;
 {
    wxString mapFile, file, url, doc;
    int id,i,len;


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

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

          file << WXEXTHELP_SEPARATOR << ifile;
       }
       else
          file << WXEXTHELP_SEPARATOR << ifile;
       }
       else


@@ -150,7 +153,7 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
             buffer[len-1] = '\0'; // cut of trailing newline
          if(sscanf(buffer,"%d", &id) != 1)
             break; // error
             buffer[len-1] = '\0'; // cut of trailing newline
          if(sscanf(buffer,"%d", &id) != 1)
             break; // error

-         for(i=0; isdigit(buffer[i])||isspace(buffer[i]); i++)
+         for(i=0; isdigit(buffer[i])||isspace(buffer[i])||buffer[i]=='-'; i++)

             ; // find begin of URL
          url = "";
          while(buffer[i] && ! isspace(buffer[i]) && buffer[i] !=
             ; // find begin of URL
          url = "";
          while(buffer[i] && ! isspace(buffer[i]) && buffer[i] !=


@@ -164,8 +167,6 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
          m_MapList->Append(new wxExtHelpMapEntry(id,url,doc));
          m_NumOfEntries++;
       }
          m_MapList->Append(new wxExtHelpMapEntry(id,url,doc));
          m_NumOfEntries++;
       }

-      else
-         perror("");

    }while(! feof(input));
    fclose(input);
    
    }while(! feof(input));
    fclose(input);