wxMSW wxClipboard implementation

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 60933b44d60b8bafad333b1fef463fddf25336e2..c439ce29345f6be7871d97f2770bbfbcf73b31ce 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -49,7 +49,7 @@ IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase)
 
 wxExtHelpController::wxExtHelpController(void)
 {
-   m_MapList = NULL;
+   m_MapList = (wxList*) NULL;
    m_BrowserName = WXEXTHELP_DEFAULTBROWSER;
    m_BrowserIsNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE;
    m_NumOfEntries = 0;
@@ -76,7 +76,7 @@ wxExtHelpController::DeleteList(void)
          node = m_MapList->First();
       }
       delete m_MapList;
-      m_MapList = NULL;
+      m_MapList = (wxList*) NULL;
    }
 }
 
@@ -105,7 +105,7 @@ wxExtHelpController::Initialize(const wxString& file)
 
   
 bool
-wxExtHelpController::LoadFile(const wxString& ifile = "")
+wxExtHelpController::LoadFile(const wxString& ifile)
 {
    wxString mapFile, file, url, doc;
    int id,i,len;
@@ -118,14 +118,16 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
       file = ifile;
       if(! wxIsAbsolutePath(file))
       {
-         file = wxGetWorkingDirectory();
+         char* f = wxGetWorkingDirectory();
+         file = f;
+         delete[] f; // wxGetWorkingDirectory returns new memory
          file << WXEXTHELP_SEPARATOR << ifile;
       }
       else
          file = ifile;
    
       if(! wxDirExists(file))
-         return false;
+         return FALSE;
       
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
    }
@@ -133,7 +135,7 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
       mapFile = m_MapFile;
 
    if(! wxFileExists(mapFile))
-      return false;
+      return FALSE;
 
    DeleteList();
    m_MapList = new wxList;
@@ -141,7 +143,7 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
    
    FILE *input = fopen(mapFile.c_str(),"rt");
    if(! input)
-      return false;
+      return FALSE;
    do
    {
       if(fgets(buffer,WXEXTHELP_BUFLEN,input) && *buffer != WXEXTHELP_COMMENTCHAR)
@@ -169,7 +171,7 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
    fclose(input);
    
    m_MapFile = file; // now it's valid
-   return true;
+   return TRUE;
 }
 
 bool
@@ -194,7 +196,7 @@ wxExtHelpController::CallBrowser(wxString const &relativeURL)
                  << WXEXTHELP_SEPARATOR << relativeURL << ")"; 
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
-            return true;
+            return TRUE;
       }
    }
    command = m_BrowserName;
@@ -207,7 +209,7 @@ bool
 wxExtHelpController::DisplayContents(void)
 {
    if(! m_NumOfEntries)
-      return false;
+      return FALSE;
    wxBusyCursor b; // display a busy cursor
    return KeywordSearch("");
 }
@@ -216,7 +218,7 @@ bool
 wxExtHelpController::DisplaySection(int sectionNo)
 {
    if(! m_NumOfEntries)
-      return false;
+      return FALSE;
 
    wxBusyCursor b; // display a busy cursor
    wxNode *node = m_MapList->First();
@@ -228,7 +230,7 @@ wxExtHelpController::DisplaySection(int sectionNo)
          return CallBrowser(entry->url);
       node = node->Next();
    }
-   return false;
+   return FALSE;
 }
 
 bool
@@ -241,7 +243,7 @@ bool
 wxExtHelpController::KeywordSearch(const wxString& k)
 {
    if(! m_NumOfEntries)
-      return false;
+      return FALSE;
 
    wxBusyCursor b; // display a busy cursor
    wxString     *choices = new wxString[m_NumOfEntries];
@@ -280,7 +282,7 @@ wxExtHelpController::KeywordSearch(const wxString& k)
    else if(idx == 0)
    {
       wxMessageBox(_("No entries found."));
-      rc = false;
+      rc = FALSE;
    }
    else
    {
@@ -290,7 +292,7 @@ wxExtHelpController::KeywordSearch(const wxString& k)
       if(idx != -1)
          rc = CallBrowser(urls[idx]);
       else
-         rc = false;
+         rc = FALSE;
    }
    delete[] urls;
    delete[] choices;
@@ -302,7 +304,7 @@ wxExtHelpController::KeywordSearch(const wxString& k)
 bool
 wxExtHelpController::Quit(void)
 {
-   return true;
+   return TRUE;
 }
 
 void