X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..64d78265d0256eb00ae59b717aa97e4c5786e003:/src/generic/helphtml.cpp?ds=inline diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp index 190574aade..f8731d8d17 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -27,6 +27,8 @@ #include "wx/utils.h" #include "wx/list.h" #include "wx/intl.h" + #include "wx/msgdlg.h" + #include "wx/choicdlg.h" #endif #include "wx/helpbase.h" @@ -34,9 +36,11 @@ #include #include +#ifndef __MWERKS__ #include +#endif -#ifndef __WINDOWS__ +#if !defined(__WINDOWS__) && !defined(__OS2__) #include #endif @@ -139,7 +143,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile) { newfile = WXEXTHELP_SEPARATOR; const wxChar *cptr = wxGetLocale()->GetName().c_str(); - while(*cptr && *cptr != _T('_')) + while(*cptr && *cptr != wxT('_')) newfile << *(cptr++); if(wxDirExists(newfile)) file = newfile; @@ -217,11 +221,15 @@ wxHTMLHelpControllerBase::DisplayContents() } bool rc = FALSE; - if(contents.Length() && wxFileExists(contents.BeforeLast('#'))) + wxString file; + file << m_MapFile << WXEXTHELP_SEPARATOR << 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(""); + return rc ? TRUE : KeywordSearch(wxT("")); } bool @@ -255,7 +263,6 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k) if(! m_NumOfEntries) return FALSE; - wxBusyCursor b; // display a busy cursor wxString *choices = new wxString[m_NumOfEntries]; wxString *urls = new wxString[m_NumOfEntries]; wxString compA, compB; @@ -266,25 +273,28 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k) wxNode *node = m_MapList->First(); wxExtHelpMapEntry *entry; - compA = k; compA.LowerCase(); // we compare case insensitive - while(node) { - entry = (wxExtHelpMapEntry *)node->Data(); - compB = entry->doc; compB.LowerCase(); - if((showAll || compB.Contains(k)) && ! compB.IsEmpty()) + wxBusyCursor b; // display a busy cursor + compA = k; compA.LowerCase(); // we compare case insensitive + while(node) { - urls[idx] = entry->url; - // doesn't work: - // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR)); - //if(choices[idx].IsEmpty()) // didn't contain the ';' - // choices[idx] = (**i).doc; - choices[idx] = ""; - for(j=0;entry->doc.c_str()[j] - && entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++) - choices[idx] << entry->doc.c_str()[j]; - idx++; + entry = (wxExtHelpMapEntry *)node->Data(); + compB = entry->doc; compB.LowerCase(); + if((showAll || compB.Contains(k)) && ! compB.IsEmpty()) + { + urls[idx] = entry->url; + // doesn't work: + // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR)); + //if(choices[idx].IsEmpty()) // didn't contain the ';' + // choices[idx] = (**i).doc; + choices[idx] = ""; + for(j=0;entry->doc.c_str()[j] + && entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++) + choices[idx] << entry->doc.c_str()[j]; + idx++; + } + node = node->Next(); } - node = node->Next(); } if(idx == 1)