Develop and Download Open Source Software

MalonNote

Browse CVS Repository

/[OSDN]/malonnote/mnFrame.cpp

Diff of /malonnote/mnFrame.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.14 by maloninc, Tue Sep 13 00:40:08 2005 UTC revision 1.15 by maloninc, Tue Sep 13 04:22:15 2005 UTC
# Line 102  void mnFrame::do_layout() Line 102  void mnFrame::do_layout()
102          searchTree->Expand(searchItemRoot);          searchTree->Expand(searchItemRoot);
103  }  }
104    
105  void mnFrame::showSearchResult(mnModel* wiki)  void mnFrame::showSearchResult(mnModel* wiki, bool isExpand)
106  {  {
107          const wxArrayString*  searchStrList;          const wxArrayString*  searchStrList;
108          WikiList* wikiList;          WikiList* wikiList;
# Line 116  void mnFrame::showSearchResult(mnModel* Line 116  void mnFrame::showSearchResult(mnModel*
116                  wxString& searchStr = searchStrList->Item(i);                  wxString& searchStr = searchStrList->Item(i);
117                    
118                  wikiList = wiki->search(searchStr.mb_str());                  wikiList = wiki->search(searchStr.mb_str());
119                  addSearchResult(&searchStr, wikiList);                  addSearchResult(&searchStr, wikiList, isExpand);
120          }          }
121    
122          searchTree->ScrollTo(searchItemRoot);          searchTree->ScrollTo(searchItemRoot);
123  }  }
124    
125  void mnFrame::addSearchResult(wxString* searchStr, WikiList* wikiList)  void mnFrame::addSearchResult(wxString* searchStr, WikiList* wikiList, bool isExpand)
126  {  {
127          wxTreeItemId    searchItem;          wxTreeItemId    searchItem;
128          WikiList::Node* node;          WikiList::Node* node;
# Line 137  void mnFrame::addSearchResult(wxString* Line 137  void mnFrame::addSearchResult(wxString*
137                  searchTree->AppendItem(searchItem, *subject, -1, -1, (wxTreeItemData*)data);                  searchTree->AppendItem(searchItem, *subject, -1, -1, (wxTreeItemData*)data);
138                  node = node->GetNext();                  node = node->GetNext();
139          }          }
140    
141          searchTree->Expand(searchItemRoot);          searchTree->Expand(searchItemRoot);
142          searchTree->Expand(searchItem);          if(isExpand){
143                    searchTree->Expand(searchItem);
144            }
145            else {
146                    searchTree->Collapse(searchItem);
147            }
148  }  }
149    
150  void mnFrame::makeHtml(WikiData* wikiData, bool isHighlight)  void mnFrame::makeHtml(WikiData* wikiData, bool isHighlight)
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help