From: Karsten Ballüder Date: Thu, 29 Jul 1999 13:47:18 +0000 (+0000) Subject: fixed busy cursor X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0bcddc59c8d2d5d28e97aed65d3ceb2fce577879?ds=inline fixed busy cursor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp index 1eb1519c8f..c595157f3f 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -261,7 +261,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; @@ -272,27 +271,30 @@ 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) rc = DisplayHelp(urls[0]); else if(idx == 0)