Fix typo in last commit

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index fcf5f1f82a815b29765929d74e2eb33808366378..d43331fbc6f1d570617fd6b35e056d24bcdc5f60 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -52,64 +52,62 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-/// Name for map file.
-#define WXEXTHELP_MAPFILE   _T("wxhelp.map")
+// Name for map file.
+#define WXEXTHELP_MAPFILE                   wxT("wxhelp.map")

 
 

-/// Character introducing comments/documentation field in map file.
-#define WXEXTHELP_COMMENTCHAR   ';'
+// Character introducing comments/documentation field in map file.
+#define WXEXTHELP_COMMENTCHAR               ';'

 
 

-#define CONTENTS_ID   0
+// The ID of the Contents section
+#define WXEXTHELP_CONTENTS_ID               0

 
 

-IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase)
+// Name of environment variable to set help browser.
+#define WXEXTHELP_ENVVAR_BROWSER            wxT("WX_HELPBROWSER")

 
 

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

 
 

-/**
-   This class implements help via an external browser.
-   It requires the name of a directory containing the documentation
-   and a file mapping numerical Section numbers to relative URLS.
-*/
+IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase)

 
 wxExtHelpController::wxExtHelpController(wxWindow* parentWindow)
                    : wxHelpControllerBase(parentWindow)
 {
 
 wxExtHelpController::wxExtHelpController(wxWindow* parentWindow)
                    : wxHelpControllerBase(parentWindow)
 {

-   m_MapList = NULL;
-   m_NumOfEntries = 0;
-   m_BrowserIsNetscape = false;
+    m_MapList = NULL;
+    m_NumOfEntries = 0;
+    m_BrowserIsNetscape = false;

 
 

-   wxChar *browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSER);
-   if (browser)
-   {
-      m_BrowserName = browser;
-      browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSERISNETSCAPE);
-      m_BrowserIsNetscape = browser && (wxAtoi(browser) != 0);
-   }
+    wxChar *browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSER);
+    if (browser)
+    {
+        m_BrowserName = browser;
+        browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSERISNETSCAPE);
+        m_BrowserIsNetscape = browser && (wxAtoi(browser) != 0);
+    }

 }
 
 wxExtHelpController::~wxExtHelpController()
 {
 }
 
 wxExtHelpController::~wxExtHelpController()
 {

-   DeleteList();
+    DeleteList();

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 void wxExtHelpController::SetBrowser(const wxString& browsername, bool isNetscape)
 {
 void wxExtHelpController::SetBrowser(const wxString& browsername, bool isNetscape)
 {

-   m_BrowserName = browsername;
-   m_BrowserIsNetscape = isNetscape;
+    m_BrowserName = browsername;
+    m_BrowserIsNetscape = isNetscape;

 }
 }

+#endif

 
 

-// Set viewer: new, generic name for SetBrowser

 void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 {
 void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 {

-    SetBrowser(viewer, (flags & wxHELP_NETSCAPE) != 0);
+    m_BrowserName = viewer;
+    m_BrowserIsNetscape = (flags & wxHELP_NETSCAPE) != 0;

 }
 
 bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 {
     // construct hte URL to open -- it's just a file
 }
 
 bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 {
     // construct hte URL to open -- it's just a file

-    wxString url(_T("file://") + m_helpDir);
+    wxString url(wxT("file://") + m_helpDir);

     url << wxFILE_SEP_PATH << relativeURL;
 
     // use the explicit browser program if specified
     url << wxFILE_SEP_PATH << relativeURL;
 
     // use the explicit browser program if specified


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

-        if ( wxExecute(m_BrowserName + _T(' ') + url, wxEXEC_SYNC) != -1 )
+        if ( wxExecute(m_BrowserName + wxT(' ') + url, wxEXEC_SYNC) != -1 )

             return true;
     }
     //else: either no browser explicitly specified or we failed to open it
             return true;
     }
     //else: either no browser explicitly specified or we failed to open it


@@ -136,28 +134,28 @@ bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 class wxExtHelpMapEntry : public wxObject
 {
 public:
 class wxExtHelpMapEntry : public wxObject
 {
 public:

-   int      id;
-   wxString url;
-   wxString doc;
-   wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc)
-      { id = iid; url = iurl; doc = idoc; }
+    int      entryid;
+    wxString url;
+    wxString doc;
+
+    wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc)
+        { entryid = iid; url = iurl; doc = idoc; }

 };
 
 void wxExtHelpController::DeleteList()
 {
 };
 
 void wxExtHelpController::DeleteList()
 {

-   if (m_MapList)
-   {
-      wxList::compatibility_iterator node = m_MapList->GetFirst();
-      while (node)
-      {
-         delete (wxExtHelpMapEntry *)node->GetData();
-         m_MapList->Erase(node);
-         node = m_MapList->GetFirst();
-      }
-
-      delete m_MapList;
-      m_MapList = (wxList*) NULL;
-   }
+    if (m_MapList)
+    {
+        wxList::compatibility_iterator node = m_MapList->GetFirst();
+        while (node)
+        {
+            delete (wxExtHelpMapEntry *)node->GetData();
+            m_MapList->Erase(node);
+            node = m_MapList->GetFirst();
+        }
+
+        wxDELETE(m_MapList);
+    }

 }
 
 // This must be called to tell the controller where to find the documentation.
 }
 
 // This must be called to tell the controller where to find the documentation.


@@ -165,7 +163,7 @@ void wxExtHelpController::DeleteList()
 //  @return true on success
 bool wxExtHelpController::Initialize(const wxString& file)
 {
 //  @return true on success
 bool wxExtHelpController::Initialize(const wxString& file)
 {

-   return LoadFile(file);
+    return LoadFile(file);

 }
 
 bool wxExtHelpController::ParseMapFileLine(const wxString& line)
 }
 
 bool wxExtHelpController::ParseMapFileLine(const wxString& line)


@@ -173,11 +171,11 @@ bool wxExtHelpController::ParseMapFileLine(const wxString& line)
     const wxChar *p = line.c_str();
 
     // skip whitespace
     const wxChar *p = line.c_str();
 
     // skip whitespace

-    while ( isascii(*p) && isspace(*p) )
+    while ( isascii(*p) && wxIsspace(*p) )

         p++;
 
     // skip empty lines and comments
         p++;
 
     // skip empty lines and comments

-    if ( *p == _T('\0') || *p == WXEXTHELP_COMMENTCHAR )
+    if ( *p == wxT('\0') || *p == WXEXTHELP_COMMENTCHAR )

         return true;
 
     // the line is of the form "num url" so we must have an integer now
         return true;
 
     // the line is of the form "num url" so we must have an integer now


@@ -188,16 +186,16 @@ bool wxExtHelpController::ParseMapFileLine(const wxString& line)
         return false;
 
     p = end;
         return false;
 
     p = end;

-    while ( isascii(*p) && isspace(*p) )
+    while ( isascii(*p) && wxIsspace(*p) )

         p++;
 
     // next should be the URL
     wxString url;
     url.reserve(line.length());
         p++;
 
     // next should be the URL
     wxString url;
     url.reserve(line.length());

-    while ( isascii(*p) && !isspace(*p) )
+    while ( isascii(*p) && !wxIsspace(*p) )

         url += *p++;
 
         url += *p++;
 

-    while ( isascii(*p) && isspace(*p) )
+    while ( isascii(*p) && wxIsspace(*p) )

         p++;
 
     // and finally the optional description of the entry after comment
         p++;
 
     // and finally the optional description of the entry after comment


@@ -205,7 +203,7 @@ bool wxExtHelpController::ParseMapFileLine(const wxString& line)
     if ( *p == WXEXTHELP_COMMENTCHAR )
     {
         p++;
     if ( *p == WXEXTHELP_COMMENTCHAR )
     {
         p++;

-        while ( isascii(*p) && isspace(*p) )
+        while ( isascii(*p) && wxIsspace(*p) )

             p++;
         doc = p;
     }
             p++;
         doc = p;
     }


@@ -243,7 +241,7 @@ bool wxExtHelpController::LoadFile(const wxString& file)
         if ( ! dirExists )
         {
             // try without encoding
         if ( ! dirExists )
         {
             // try without encoding

-            const wxString locNameWithoutEncoding = locName.BeforeLast(_T('.'));
+            const wxString locNameWithoutEncoding = locName.BeforeLast(wxT('.'));

             if ( !locNameWithoutEncoding.empty() )
             {
                 helpDirLoc = helpDir;
             if ( !locNameWithoutEncoding.empty() )
             {
                 helpDirLoc = helpDir;


@@ -255,7 +253,7 @@ bool wxExtHelpController::LoadFile(const wxString& file)
         if ( !dirExists )
         {
             // try without country part
         if ( !dirExists )
         {
             // try without country part

-            wxString locNameWithoutCountry = locName.BeforeLast(_T('_'));
+            wxString locNameWithoutCountry = locName.BeforeLast(wxT('_'));

             if ( !locNameWithoutCountry.empty() )
             {
                 helpDirLoc = helpDir;
             if ( !locNameWithoutCountry.empty() )
             {
                 helpDirLoc = helpDir;


@@ -318,53 +316,53 @@ bool wxExtHelpController::LoadFile(const wxString& file)
 
 bool wxExtHelpController::DisplayContents()
 {
 
 bool wxExtHelpController::DisplayContents()
 {

-   if (! m_NumOfEntries)
-      return false;
+    if (! m_NumOfEntries)
+        return false;

 
 

-   wxString contents;
-   wxList::compatibility_iterator node = m_MapList->GetFirst();
-   wxExtHelpMapEntry *entry;
-   while (node)
-   {
-      entry = (wxExtHelpMapEntry *)node->GetData();
-      if (entry->id == CONTENTS_ID)
-      {
-         contents = entry->url;
-         break;
-      }
-
-      node = node->GetNext();
-   }
-
-   bool rc = false;
-   wxString file;
-   file << m_helpDir << wxFILE_SEP_PATH << contents;
-   if (file.Contains(wxT('#')))
-      file = file.BeforeLast(wxT('#'));
-   if (contents.length() && wxFileExists(file))
-      rc = DisplaySection(CONTENTS_ID);
-
-   // if not found, open homemade toc:
-   return rc ? true : KeywordSearch(wxEmptyString);
+    wxString contents;
+    wxList::compatibility_iterator node = m_MapList->GetFirst();
+    wxExtHelpMapEntry *entry;
+    while (node)
+    {
+        entry = (wxExtHelpMapEntry *)node->GetData();
+        if (entry->entryid == WXEXTHELP_CONTENTS_ID)
+        {
+            contents = entry->url;
+            break;
+        }
+
+        node = node->GetNext();
+    }
+
+    bool rc = false;
+    wxString file;
+    file << m_helpDir << wxFILE_SEP_PATH << contents;
+    if (file.Contains(wxT('#')))
+        file = file.BeforeLast(wxT('#'));
+    if ( wxFileExists(file) )
+        rc = DisplaySection(WXEXTHELP_CONTENTS_ID);
+
+    // if not found, open homemade toc:
+    return rc ? true : KeywordSearch(wxEmptyString);

 }
 
 bool wxExtHelpController::DisplaySection(int sectionNo)
 {
 }
 
 bool wxExtHelpController::DisplaySection(int sectionNo)
 {

-   if (! m_NumOfEntries)
-      return false;
+    if (! m_NumOfEntries)
+        return false;

 
 

-   wxBusyCursor b; // display a busy cursor
-   wxList::compatibility_iterator node = m_MapList->GetFirst();
-   wxExtHelpMapEntry *entry;
-   while (node)
-   {
-      entry = (wxExtHelpMapEntry *)node->GetData();
-      if (entry->id == sectionNo)
-         return DisplayHelp(entry->url);
-      node = node->GetNext();
-   }
+    wxBusyCursor b; // display a busy cursor
+    wxList::compatibility_iterator node = m_MapList->GetFirst();
+    wxExtHelpMapEntry *entry;
+    while (node)
+    {
+        entry = (wxExtHelpMapEntry *)node->GetData();
+        if (entry->entryid == sectionNo)
+            return DisplayHelp(entry->url);
+        node = node->GetNext();
+    }

 
 

-   return false;
+    return false;

 }
 
 bool wxExtHelpController::DisplaySection(const wxString& section)
 }
 
 bool wxExtHelpController::DisplaySection(const wxString& section)


@@ -379,7 +377,7 @@ bool wxExtHelpController::DisplaySection(const wxString& section)
 
 bool wxExtHelpController::DisplayBlock(long blockNo)
 {
 
 bool wxExtHelpController::DisplayBlock(long blockNo)
 {

-   return DisplaySection((int)blockNo);
+    return DisplaySection((int)blockNo);

 }
 
 bool wxExtHelpController::KeywordSearch(const wxString& k,
 }
 
 bool wxExtHelpController::KeywordSearch(const wxString& k,