fixed busy cursor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -261,7 +261,6 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
|
|||||||
if(! m_NumOfEntries)
|
if(! m_NumOfEntries)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
wxBusyCursor b; // display a busy cursor
|
|
||||||
wxString *choices = new wxString[m_NumOfEntries];
|
wxString *choices = new wxString[m_NumOfEntries];
|
||||||
wxString *urls = new wxString[m_NumOfEntries];
|
wxString *urls = new wxString[m_NumOfEntries];
|
||||||
wxString compA, compB;
|
wxString compA, compB;
|
||||||
@@ -272,27 +271,30 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
|
|||||||
wxNode *node = m_MapList->First();
|
wxNode *node = m_MapList->First();
|
||||||
wxExtHelpMapEntry *entry;
|
wxExtHelpMapEntry *entry;
|
||||||
|
|
||||||
compA = k; compA.LowerCase(); // we compare case insensitive
|
|
||||||
while(node)
|
|
||||||
{
|
{
|
||||||
entry = (wxExtHelpMapEntry *)node->Data();
|
wxBusyCursor b; // display a busy cursor
|
||||||
compB = entry->doc; compB.LowerCase();
|
compA = k; compA.LowerCase(); // we compare case insensitive
|
||||||
if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
|
while(node)
|
||||||
{
|
{
|
||||||
urls[idx] = entry->url;
|
entry = (wxExtHelpMapEntry *)node->Data();
|
||||||
// doesn't work:
|
compB = entry->doc; compB.LowerCase();
|
||||||
// choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
|
if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
|
||||||
//if(choices[idx].IsEmpty()) // didn't contain the ';'
|
{
|
||||||
// choices[idx] = (**i).doc;
|
urls[idx] = entry->url;
|
||||||
choices[idx] = "";
|
// doesn't work:
|
||||||
for(j=0;entry->doc.c_str()[j]
|
// choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
|
||||||
&& entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++)
|
//if(choices[idx].IsEmpty()) // didn't contain the ';'
|
||||||
choices[idx] << entry->doc.c_str()[j];
|
// choices[idx] = (**i).doc;
|
||||||
idx++;
|
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)
|
if(idx == 1)
|
||||||
rc = DisplayHelp(urls[0]);
|
rc = DisplayHelp(urls[0]);
|
||||||
else if(idx == 0)
|
else if(idx == 0)
|
||||||
|
Reference in New Issue
Block a user