Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 64e1695638712da15ce9c2157a9ddc0707d16f4b..af4644ad858444b440a0047bf6ea5eb14ebfb236 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -53,7 +52,7 @@
 // ----------------------------------------------------------------------------
 
 // Name for map file.
 // ----------------------------------------------------------------------------
 
 // Name for map file.

-#define WXEXTHELP_MAPFILE                   _T("wxhelp.map")
+#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               ';'


@@ -90,11 +89,13 @@ wxExtHelpController::~wxExtHelpController()
     DeleteList();
 }
 
     DeleteList();
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 void wxExtHelpController::SetBrowser(const wxString& browsername, bool isNetscape)
 {
     m_BrowserName = browsername;
     m_BrowserIsNetscape = isNetscape;
 }
 void wxExtHelpController::SetBrowser(const wxString& browsername, bool isNetscape)
 {
     m_BrowserName = browsername;
     m_BrowserIsNetscape = isNetscape;
 }

+#endif

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


@@ -105,7 +106,7 @@ void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 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


@@ -120,7 +121,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


@@ -132,12 +133,12 @@ bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 class wxExtHelpMapEntry : public wxObject
 {
 public:
 class wxExtHelpMapEntry : public wxObject
 {
 public:

-    int      id;
+    int      entryid;

     wxString url;
     wxString doc;
 
     wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc)
     wxString url;
     wxString doc;
 
     wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc)

-        { id = iid; url = iurl; doc = idoc; }
+        { entryid = iid; url = iurl; doc = idoc; }

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


@@ -152,8 +153,7 @@ void wxExtHelpController::DeleteList()
             node = m_MapList->GetFirst();
         }
 
             node = m_MapList->GetFirst();
         }
 

-        delete m_MapList;
-        m_MapList = (wxList*) NULL;
+        wxDELETE(m_MapList);

     }
 }
 
     }
 }
 


@@ -170,11 +170,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


@@ -185,16 +185,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


@@ -202,7 +202,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;
     }


@@ -240,7 +240,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;


@@ -252,7 +252,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;


@@ -324,7 +324,7 @@ bool wxExtHelpController::DisplayContents()
     while (node)
     {
         entry = (wxExtHelpMapEntry *)node->GetData();
     while (node)
     {
         entry = (wxExtHelpMapEntry *)node->GetData();

-        if (entry->id == WXEXTHELP_CONTENTS_ID)
+        if (entry->entryid == WXEXTHELP_CONTENTS_ID)

         {
             contents = entry->url;
             break;
         {
             contents = entry->url;
             break;


@@ -338,7 +338,7 @@ bool wxExtHelpController::DisplayContents()
     file << m_helpDir << wxFILE_SEP_PATH << contents;
     if (file.Contains(wxT('#')))
         file = file.BeforeLast(wxT('#'));
     file << m_helpDir << wxFILE_SEP_PATH << contents;
     if (file.Contains(wxT('#')))
         file = file.BeforeLast(wxT('#'));

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

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


@@ -356,7 +356,7 @@ bool wxExtHelpController::DisplaySection(int sectionNo)
     while (node)
     {
         entry = (wxExtHelpMapEntry *)node->GetData();
     while (node)
     {
         entry = (wxExtHelpMapEntry *)node->GetData();

-        if (entry->id == sectionNo)
+        if (entry->entryid == sectionNo)

             return DisplayHelp(entry->url);
         node = node->GetNext();
     }
             return DisplayHelp(entry->url);
         node = node->GetNext();
     }