Fix Tab navigation when focused control is disabled.

[wxWidgets.git] / src / html / helpdata.cpp

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 506fc99d8fe6b6f0620c94cda83f03f9832552f3..f67b1689c8886b8ba4b0dd82b4ce832635de23ff 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -51,11 +51,11 @@ static const wxChar* ReadLine(const wxChar *line, wxChar *buf, size_t bufsize)
     wxChar *endptr = buf + bufsize - 1;
     const wxChar *readptr = line;
 
     wxChar *endptr = buf + bufsize - 1;
     const wxChar *readptr = line;
 

-    while (*readptr != 0 && *readptr != _T('\r') && *readptr != _T('\n') &&
+    while (*readptr != 0 && *readptr != wxT('\r') && *readptr != wxT('\n') &&

            writeptr != endptr)
         *(writeptr++) = *(readptr++);
     *writeptr = 0;
            writeptr != endptr)
         *(writeptr++) = *(readptr++);
     *writeptr = 0;

-    while (*readptr == _T('\r') || *readptr == _T('\n'))
+    while (*readptr == wxT('\r') || *readptr == wxT('\n'))

         readptr++;
     if (*readptr == 0)
         return NULL;
         readptr++;
     if (*readptr == 0)
         return NULL;


@@ -255,7 +255,7 @@ wxString wxHtmlHelpDataItem::GetIndentedName() const
 {
     wxString s;
     for (int i = 1; i < level; i++)
 {
     wxString s;
     for (int i = 1; i < level; i++)

-        s << _T("   ");
+        s << wxT("   ");

     s << name;
     return s;
 }
     s << name;
     return s;
 }


@@ -476,10 +476,10 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
     else
     {
         if (wxIsAbsolutePath(path)) m_tempPath = path;
     else
     {
         if (wxIsAbsolutePath(path)) m_tempPath = path;

-        else m_tempPath = wxGetCwd() + _T("/") + path;
+        else m_tempPath = wxGetCwd() + wxT("/") + path;

 
 

-        if (m_tempPath[m_tempPath.length() - 1] != _T('/'))
-            m_tempPath << _T('/');
+        if (m_tempPath[m_tempPath.length() - 1] != wxT('/'))
+            m_tempPath << wxT('/');

     }
 }
 
     }
 }
 


@@ -569,7 +569,6 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_contents.size());
 
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_contents.size());
 

-#if wxUSE_WCHAR_T

     // MS HTML Help files [written by MS HTML Help Workshop] are broken
     // in that the data are iso-8859-1 (including HTML entities), but must
     // be interpreted as being in language's windows charset. Correct the
     // MS HTML Help files [written by MS HTML Help Workshop] are broken
     // in that the data are iso-8859-1 (including HTML entities), but must
     // be interpreted as being in language's windows charset. Correct the


@@ -597,11 +596,6 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
         }
         #undef CORRECT_STR
     }
         }
         #undef CORRECT_STR
     }

-#else
-    wxUnusedVar(IndexOld);
-    wxUnusedVar(ContentsOld);
-    wxASSERT_MSG(encoding == wxFONTENCODING_SYSTEM, wxT("Help files need charset conversion, but wxUSE_WCHAR_T is 0"));
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

 
     m_bookRecords.Add(bookr);
     if (!m_index.empty())
 
     m_bookRecords.Add(bookr);
     if (!m_index.empty())


@@ -674,16 +668,16 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
         for (wxChar *ch = linebuf; *ch != wxT('\0') && *ch != wxT('='); ch++)
            *ch = (wxChar)wxTolower(*ch);
 
         for (wxChar *ch = linebuf; *ch != wxT('\0') && *ch != wxT('='); ch++)
            *ch = (wxChar)wxTolower(*ch);
 

-        if (wxStrstr(linebuf, _T("title=")) == linebuf)
-            title = linebuf + wxStrlen(_T("title="));
-        if (wxStrstr(linebuf, _T("default topic=")) == linebuf)
-            start = linebuf + wxStrlen(_T("default topic="));
-        if (wxStrstr(linebuf, _T("index file=")) == linebuf)
-            index = linebuf + wxStrlen(_T("index file="));
-        if (wxStrstr(linebuf, _T("contents file=")) == linebuf)
-            contents = linebuf + wxStrlen(_T("contents file="));
-        if (wxStrstr(linebuf, _T("charset=")) == linebuf)
-            charset = linebuf + wxStrlen(_T("charset="));
+        if (wxStrstr(linebuf, wxT("title=")) == linebuf)
+            title = linebuf + wxStrlen(wxT("title="));
+        if (wxStrstr(linebuf, wxT("default topic=")) == linebuf)
+            start = linebuf + wxStrlen(wxT("default topic="));
+        if (wxStrstr(linebuf, wxT("index file=")) == linebuf)
+            index = linebuf + wxStrlen(wxT("index file="));
+        if (wxStrstr(linebuf, wxT("contents file=")) == linebuf)
+            contents = linebuf + wxStrlen(wxT("contents file="));
+        if (wxStrstr(linebuf, wxT("charset=")) == linebuf)
+            charset = linebuf + wxStrlen(wxT("charset="));

     } while (lineptr != NULL);
 
     wxFontEncoding enc = wxFONTENCODING_SYSTEM;
     } while (lineptr != NULL);
 
     wxFontEncoding enc = wxFONTENCODING_SYSTEM;


@@ -714,9 +708,9 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
             break;
         }
     }
             break;
         }
     }

-    
+

     int cnt = m_bookRecords.GetCount();
     int cnt = m_bookRecords.GetCount();

-    
+

     if (!has_non_ascii)
     {
       wxFileSystem fsys;
     if (!has_non_ascii)
     {
       wxFileSystem fsys;


@@ -844,11 +838,11 @@ bool wxHtmlSearchStatus::Search()
     {
         const wxChar *p1, *p2;
         for (p1 = thepage.c_str(), p2 = m_LastPage.c_str();
     {
         const wxChar *p1, *p2;
         for (p1 = thepage.c_str(), p2 = m_LastPage.c_str();

-             *p1 != 0 && *p1 != _T('#') && *p1 == *p2; p1++, p2++) {}
+             *p1 != 0 && *p1 != wxT('#') && *p1 == *p2; p1++, p2++) {}

 
         m_LastPage = thepage;
 
 
         m_LastPage = thepage;
 

-        if (*p1 == 0 || *p1 == _T('#'))
+        if (*p1 == 0 || *p1 == wxT('#'))

             return false;
     }
     else m_LastPage = thepage;
             return false;
     }
     else m_LastPage = thepage;


@@ -892,7 +886,7 @@ void wxHtmlSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, b
 
 static inline bool WHITESPACE(wxChar c)
 {
 
 static inline bool WHITESPACE(wxChar c)
 {

-    return c == _T(' ') || c == _T('\n') || c == _T('\r') || c == _T('\t');
+    return c == wxT(' ') || c == wxT('\n') || c == wxT('\r') || c == wxT('\t');

 }
 
 // replace continuous spaces by one single space
 }
 
 // replace continuous spaces by one single space


@@ -911,7 +905,7 @@ static inline wxString CompressSpaces(const wxString & str)
             {
                 continue;
             }
             {
                 continue;
             }

-            ch = _T(' ');
+            ch = wxT(' ');

             space_counted = true;
         }
         else
             space_counted = true;
         }
         else


@@ -943,19 +937,19 @@ bool wxHtmlSearchEngine::Scan(const wxFSFile& file)
             wxChar c = *pBufStr;
             if (insideTag)
             {
             wxChar c = *pBufStr;
             if (insideTag)
             {

-                if (c == _T('>'))
+                if (c == wxT('>'))

                 {
                     insideTag = false;
                     // replace the tag by an empty space
                 {
                     insideTag = false;
                     // replace the tag by an empty space

-                    c = _T(' ');
+                    c = wxT(' ');

                 }
                 else
                     continue;
             }
                 }
                 else
                     continue;
             }

-            else if (c == _T('<'))
+            else if (c == wxT('<'))

             {
                 wxChar nextCh = *(pBufStr + 1);
             {
                 wxChar nextCh = *(pBufStr + 1);

-                if (nextCh == _T('/') || !WHITESPACE(nextCh))
+                if (nextCh == wxT('/') || !WHITESPACE(nextCh))

                 {
                     insideTag = true;
                     continue;
                 {
                     insideTag = true;
                     continue;


@@ -971,10 +965,10 @@ bool wxHtmlSearchEngine::Scan(const wxFSFile& file)
     if (m_WholeWords)
     {
         // insert ' ' at the beginning and at the end
     if (m_WholeWords)
     {
         // insert ' ' at the beginning and at the end

-        keyword.insert( 0, _T(" ") );
-        keyword.append( _T(" ") );
-        bufStr.insert( 0, _T(" ") );
-        bufStr.append( _T(" ") );
+        keyword.insert( 0, wxT(" ") );
+        keyword.append( wxT(" ") );
+        bufStr.insert( 0, wxT(" ") );
+        bufStr.append( wxT(" ") );

     }
 
     // remove continuous spaces
     }
 
     // remove continuous spaces