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.18 by maloninc, Thu Sep 15 09:20:48 2005 UTC revision 1.19 by maloninc, Fri Sep 16 04:12:58 2005 UTC
# Line 115  void mnFrame::do_layout() Line 115  void mnFrame::do_layout()
115    
116  void mnFrame::showSearchResult(mnModel* wiki, bool isExpand)  void mnFrame::showSearchResult(mnModel* wiki, bool isExpand)
117  {  {
118  /*          wxLogMessage(wxT("showSearchResult is not available"));
         const wxArrayString*  searchStrList;  
         int i;  
   
         searchTree->DeleteChildren(searchItemRoot);  
   
         searchStrList = wiki->getSearchStrList();  
         for(i = 0; i < searchStrList->Count(); i++) {  
                 wxString& searchStr = searchStrList->Item(i);  
                 addSearchResult(wiki, &searchStr, isExpand);  
         }  
   
         searchTree->ScrollTo(searchItemRoot);  
 */  
         wxLogMessage(wxT("showSearchResult was invalid"));  
119  }  }
120    
121  void mnFrame::updateSearchResult(mnModel* wiki, wxString* searchStr, bool isExpand)  void mnFrame::updateSearchResult(mnModel* wiki, wxString* searchStr, bool isExpand)
# Line 159  void mnFrame::updateSearchResult(mnModel Line 145  void mnFrame::updateSearchResult(mnModel
145          }          }
146    
147          wikiList = wiki->getSearchResultList(searchStr);          wikiList = wiki->getSearchResultList(searchStr);
148            if(wikiList == NULL) {
149                    MN_FATAL_ERROR(wxT("wikiList is null"));
150                    return;
151            }
152    
153          node = wikiList->GetFirst();          node = wikiList->GetFirst();
154          while(node) {          while(node) {
155                  data = node->GetData();                  data = node->GetData();
# Line 183  void mnFrame::addSearchResult(mnModel* w Line 174  void mnFrame::addSearchResult(mnModel* w
174          const wxString* subject;          const wxString* subject;
175    
176          wikiList = wiki->getSearchResultList(searchStr);          wikiList = wiki->getSearchResultList(searchStr);
177            if(wikiList == NULL) {
178                    MN_FATAL_ERROR(wxT("wikiList is null"));
179                    return;
180            }
181    
182          //searchItem = searchTree->AppendItem(searchItemRoot, *searchStr, -1, -1, NULL);          //searchItem = searchTree->AppendItem(searchItemRoot, *searchStr, -1, -1, NULL);
183          searchItem = searchTree->InsertItem(searchItemRoot, 0, *searchStr, -1, -1, NULL);          searchItem = searchTree->InsertItem(searchItemRoot, 0, *searchStr, -1, -1, NULL);
184          node = wikiList->GetFirst();          node = wikiList->GetFirst();
# Line 281  void mnFrame::showSelectedItemText(wxTre Line 277  void mnFrame::showSelectedItemText(wxTre
277          wxTreeItemData* item;          wxTreeItemData* item;
278    
279          id = searchTree->GetSelection();          id = searchTree->GetSelection();
         if(!id.IsOk()) return ;  
280          item = searchTree->GetItemData(id);          item = searchTree->GetItemData(id);
281    
282          if(item == NULL) return ;          if(!id.IsOk() || !isEditableTreeLabel(id) || item == NULL) { /* selection is not memo data */
   
         if(!isEditableTreeLabel(id)) { /* selection is not memo data */  
283                  wikiHtmlTextCtrl->SetPage(wxT(""));                  wikiHtmlTextCtrl->SetPage(wxT(""));
284                  return;                  return;
285          }          }
# Line 343  void mnFrame::collapseAllTree() Line 336  void mnFrame::collapseAllTree()
336    
337  void mnFrame::clearAllTree()  void mnFrame::clearAllTree()
338  {  {
339            wxTreeItemIdValue cookie1, cookie2;
340            wxTreeItemId      searchStrId;
341            wxTreeItemId      wikiDataId;
342    
343            memset(&cookie1, 1, sizeof(cookie1));
344            memset(&cookie2, 2, sizeof(cookie2));
345            searchStrId = searchTree->GetFirstChild(searchItemRoot, cookie1);
346            while(searchStrId.IsOk()) {
347                    wikiDataId = searchTree->GetFirstChild(searchStrId, cookie2);
348                    while(wikiDataId.IsOk()) {
349                            searchTree->SetItemData(wikiDataId, NULL);
350                            wikiDataId = searchTree->GetNextChild(searchStrId, cookie2);
351                    }
352                    searchStrId = searchTree->GetNextChild(searchItemRoot, cookie1);
353            }
354    
355          searchTree->DeleteChildren(searchItemRoot);          searchTree->DeleteChildren(searchItemRoot);
356  }  }
357    
358  void mnFrame::removeSelectedItem()  void mnFrame::removeSelectedItem()
359  {  {
360          searchTree->DeleteChildren(searchTree->GetSelection());          searchTree->Delete(searchTree->GetSelection());
361  }  }
362    
363  wxTreeItemData* mnFrame::getSelectedItem()  wxTreeItemData* mnFrame::getSelectedItem()
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help