X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src2%2FcreaImageIOWxTreeView.cpp;h=3a24eb49c714ce34db23bb793f7845ee9cd8bcdb;hb=88745f8677503fa747963f8cd78c52f4b3deb35e;hp=bd640783e8a210ffec1bdbec9dfa76f3317fd5fe;hpb=2f0e50f69eb904d629cf8db62eb9a4094db93097;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index bd64078..3a24eb4 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -1,25 +1,74 @@ #include +#include #include #include -int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData)) -{ - // inverse the order - if (item1 < item2) - return -1; - if (item1 > item2) - return 1; +#include +///Comparing function for ordering algorithm. Takes parameters as strings. +int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData) +{ + std::string s1((char*)((long*)item1)[1]); + std::string s2((char*)((long*)item2)[1]); + if(sortData==1) + { + // inverse the order + if (s1 < s2) + return 1; + if (s1 > s2) + return -1; + + return 0; + } + else + { + if (s1 < s2) + return -1; + if (s1 > s2) + return 1; - return 0; + return 0; + + } + +} + +///Comparing function for ordering algorithm. Takes parameters as ints. +int wxCALLBACK CompareFunctionInts(long item1, long item2, long sortData) +{ + int val1=atoi((char*)((long*)item1)[1]); + int val2=atoi((char*)((long*)item2)[1]); + if(sortData==1) + { + // inverse the order + if (val1 < val2) + return 1; + if (val1 > val2) + return -1; + + return 0; + } + else + { + if (val1 < val2) + return -1; + if (val1 > val2) + return 1; + + return 0; + + } + } + namespace creaImageIO { //===================================================================== // CTor WxTreeView::WxTreeView(TreeHandler* handler, + GimmickView* gimmick, wxWindow* parent, const wxWindowID id) : wxPanel(parent,id), - TreeView(handler) + TreeView(handler,gimmick) { GimmickDebugMessage(1,"WxTreeView::WxTreeView" < 0 (not for Root level) @@ -62,29 +111,26 @@ namespace creaImageIO level.wxCtrl = ctrl; level.wxSplitter->Initialize(ctrl); - // Create the columns : one for each attribute of the level - int col = 0; - //ctrl->InsertItem(0, "1"); + // Create the first column : number of children + std::string title = "#"; + if (iGetTree().GetNumberOfLevels()-1) + { + title += handler->GetTree().GetLevelDescriptor(i+1).GetName(); + if (title[title.size()-1]!='s') + title += "s"; + } + ctrl->InsertColumn(0,crea::std2wx(title),col_style); + + + // Create the columns : one for each attribute of the level + int col = 1; tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; for (a = handler->GetTree().GetAttributeDescriptorList(i).begin(); a != handler->GetTree().GetAttributeDescriptorList(i).end(); ++a) { - if(col==0) - { - wxListItem it; - it.SetTextColour(*wxRED); - it.SetText(_T("#C")); - it.SetColumn(col); - // ctrl->InsertColumn(col, _("Children"), col_style); - ctrl->InsertColumn(col,it); - //ctrl->InsertItem(0, "1"); - //level.key.push_back(_("Children")); - //level.key.push_back(handler->GetTree().GetChildrenList().size()); - col++; - } - + GimmickDebugMessage(5,"Creating column "<GetName() <Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); - + mColumnSelected=1; + mLastSelected=0; + mDirection=true; + mSelectionMade=false; + mProcess=true; + CreateColorPalette(); UpdateLevel(1); SetSizer( sizer ); @@ -129,6 +180,7 @@ namespace creaImageIO struct ItemData { tree::Node* node; + int id; }; //===================================================================== @@ -151,11 +203,20 @@ namespace creaImageIO { long adr = GetCtrl(l-1)->GetItemData(i); tree::Node* n = ((ItemData*)adr)->node; - sel.push_back(n); + if(mLastSelected==i) + { + std::vector::iterator it; + it = sel.begin(); + it = sel.insert ( it , n ); + } + else + { + sel.push_back(n); + } } } } - + return sel; } @@ -195,7 +256,7 @@ namespace creaImageIO //===================================================================== - /// + /// Updates a level of the view (adds or removes children, proganizes, etc.) void WxTreeView::UpdateLevel( int level ) { GimmickDebugMessage(1, @@ -217,7 +278,7 @@ namespace creaImageIO } //===================================================================== - /// + /// Recursive method called upon by UpdateLevel to refresh all windows void WxTreeView::RecursiveUpdateLevel( int level ) { GimmickDebugMessage(2, @@ -235,6 +296,8 @@ namespace creaImageIO GetCtrl(l)->DeleteAllItems(); std::vector::iterator i; + //Adds the first item (filter) + GetCtrl(l)->InsertItem(0, _T("Filter:")); for (i=sel.begin(); i!=sel.end(); ++i) { GimmickDebugMessage(2, @@ -242,8 +305,10 @@ namespace creaImageIO <<(*i)->GetLabel() <<"'"<LoadChildren(*i,1); tree::Node::ChildrenListType::reverse_iterator j; for (j = (*i)->GetChildrenList().rbegin(); @@ -260,49 +325,44 @@ namespace creaImageIO ); ItemData* data = new ItemData; - data->node = *j; - item.SetData(data); - - long id = GetCtrl(l)->InsertItem(item); + data->node = *j; + item.SetId(_id); + data->id = _id; + item.SetData(data); + + _id++; + long id=GetCtrl(l)->InsertItem(item); + + //Setting first column (number of children) std::ostringstream oss; int n= GetTreeHandler()->GetNumberOfChildren(*j); - oss << n; std::string s(oss.str()); - - item.SetText( crea::std2wx(s)); - // item.SetTextColour(*wxRED); - // item.SetBackgroundColour(*wxBLACK); + item.SetText( crea::std2wx(s)); + item.SetColumn(0); GetCtrl(l)->SetItem(item); - // GetCtrl(l)->SetItem(id,0, crea::std2wx(s)); - // GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE ); - + + //Setting other attributes for (int k=1; kGetColumnCount(); k++) { - + std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]); if (val.size()==0) val = "?"; item.SetText( crea::std2wx(val)); - // item.SetTextColour(*wxBLACK); - // item.SetBackgroundColour(*wxWHITE); item.SetColumn(k); - GetCtrl(l)->SetItem(item); - - // GetCtrl(l)->SetItem(id,k, crea::std2wx(val)); - // GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE ); - - } - + GetCtrl(l)->SetItem(item); + } } } GetCtrl(l)->Show(); - + if (level sel=GetSelected(level+1); - - tree::Node* nodes[20]; - - int l = level - 1; - - // to speed up inserting we hide the control temporarily - GetCtrl(level)->Hide(); - GetCtrl(level)->DeleteAllItems(); - - std::vector::iterator i; - int num=0; - for (i=sel.begin(); i!=sel.end(); ++i) - { - - //Adds columns - GetTreeHandler()->LoadChildren(*i,1); - tree::Node::ChildrenListType::reverse_iterator j; - - for (j = (*i)->GetChildrenList().rbegin(); - j!= (*i)->GetChildrenList().rend(); - ++j) - { - nodes[num]=*j; - num++; - } - } - - //Sorting elements - int k, m; - tree::Node* index; - - - for (k=1; kGetAttribute(mLevelList[level].key[colNum-1]) - <<"Comparison Key 2: "<<(index)->GetAttribute(mLevelList[level].key[colNum-1]) - < 0) && ((nodes[m-1])->GetAttribute(mLevelList[level].key[colNum-1]) > - (index)->GetAttribute(mLevelList[level].key[colNum-1]))) + if(levelClearSelection(); + } + if (level==mLevelList.size()-2) SelectLowerLevel(); + if (level==(mLevelList.size()-1)&&mProcess) + { + ValidateSelectedImages (); } - nodes[m] = index; } - - for (m=0; mSetItemText(0,crea::std2wx("")); + GetCtrl(level)->EditLabel(event.m_itemIndex); + } + + } + + + } + //================================================================ - long id = GetCtrl(level)->InsertItem(item); - int n; - if ((node)->GetChildrenLoaded()) + //================================================================ + void WxTreeView::SelectLowerLevel() + { + long item = -1; + int level=mLevelList.size()-1; + + for ( ;; ) + { + item = GetCtrl(level)->GetNextItem(item, + wxLIST_NEXT_ALL); + if ( item == -1 ) + break; + + if(item==(GetCtrl(level)->GetItemCount()-1)) { - n=(node)->GetChildrenList().size(); + mProcess=true; } else { - n= GetTreeHandler()->GetNumberOfChildren(node); + mProcess=false; } - std::ostringstream oss; - - oss << n; - std::string s(oss.str()); - GetCtrl(level)->SetItem(id,0, crea::std2wx(s)); - GetCtrl(level)->SetColumnWidth(0, wxLIST_AUTOSIZE ); - - for (int k=1; kGetColumnCount(); k++) - { - std::string val = (node)->GetAttribute(mLevelList[level].key[k-1]); - if (val.size()==0) val = "?"; - GetCtrl(level)->SetItem(id,k, crea::std2wx(val)); - GetCtrl(level)->SetColumnWidth(k, wxLIST_AUTOSIZE ); + if(item!=0) + { + GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE + | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); + } - } - - } + } - - GetCtrl(level)->Show(); -*/ + } + //================================================================ - void WxTreeView::ValidateSelectedImages() - { - int level=mLevelList.size(); - std::vector sel=GetSelected(level+1); - if(sel.size()>0) + //================================================================ + void WxTreeView::OnColClick(wxListEvent& event) + { + //Obtain the column name and the level that needs to be organized + mColumnSelected=event.m_col; + GimmickDebugMessage(1, + " Column selected: " <::iterator i; - bool valid=true; - std::string row; - std::string col; - std::string plane; + wxObject* ctrl = event.GetEventObject(); + unsigned int level = 0; + for (level = 0; levelDeleteItem(0); + //Sets the data for the items to be sorted + std::string att; + unsigned int ty=0; + int n = GetCtrl(level)->GetItemCount(); + for (int i = 0; i < n; i++) { - if(i==sel.begin()) + + //Gets current item data + long adr = GetCtrl(level)->GetItemData(i); + //Extracts the node and the type of attribute + tree::Node* nod = ((ItemData*)adr)->node; + if(i==0) { - row=(*i)->GetAttribute(mLevelList[level-1].key[1]); - col=(*i)->GetAttribute(mLevelList[level-1].key[2]); - plane=(*i)->GetAttribute(mLevelList[level-1].key[3]); + (*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).DecodeType(ty); + } + //Obtains the organizing attribute + att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]); + + char* d= new char [att.size()+1]; + strcpy (d, att.c_str()); + + //Creates array + long* lp= new long[2]; + lp[0]=adr; + lp[1]=(long)d; + + //Sets it as the data + GetCtrl(level)->SetItemData(i,(long)lp); + } + + if(mDirection) + { + if(ty==1) + { + GetCtrl(level)->SortItems(CompareFunctionInts, 0); } else { - if(((*i)->GetAttribute(mLevelList[level-1].key[1]))!=row || - ((*i)->GetAttribute(mLevelList[level-1].key[2]))!=col || - ((*i)->GetAttribute(mLevelList[level-1].key[3]))!=plane) - { - valid=false; - } + GetCtrl(level)->SortItems(CompareFunctionStrings, 0); } + + mDirection=false; } - - GimmickMessage(1, - "State check: Planes:" - <> rows; - if(row==""){rows=1;} - s=col; - t >> cols; - if(col==""){cols=1;} - s=plane; - t >> planes; - if(plane==""){planes=1;} - - int dim = 0; - if (planes>1) dim=3; - else if (cols>1) dim=2; - else if (rows>1) dim=1; - - if (dim == 0) + else + { + if(ty==1) { - GimmickMessage(1, - "Unknown image dimension : cannot select !" - <SortItems(CompareFunctionInts, 1); } - else if (dim>GetMaxDimension()) + else { - GimmickMessage(1,"Selecting "<SortItems(CompareFunctionStrings, 1); } - if ( dim == GetMaxDimension() ) + mDirection=true; + } + + //Resets original data + std::vector::iterator selection; + std::vector change; + long it = -1; + for ( ;; ) + { + it = GetCtrl(level)->GetNextItem(it, + wxLIST_NEXT_ALL); + if ( it == -1 ) + break; + + //Gets current item data, extracts the node and resets it + long item = GetCtrl(level)->GetItemData(it); + GetCtrl(level)->SetItemData(it,((long*)item)[0]); + tree::Node* n= ((ItemData*)((long*)item)[0])->node; + if(levelGetAttribute("ID").compare(n->GetAttribute("ID"))==0) + { + change.push_back(it); + } + } } + else + { + for(selection=mLastLevelSelected.begin();selection!=mLastLevelSelected.end();++selection) + { + if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0) + { + change.push_back(it); + } + } + } + + } - - //Send an event telling wether the selection is valid or not - wxCommandEvent event( 0, GetId() ); - event.SetEventObject( this ); - if(valid) - {event.SetInt(0);} - else - {event.SetInt(1);} - GetEventHandler()->ProcessEvent( event ); - } + //Resets the selected items + std::vector::iterator selectedIts; + for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts) + { + GetCtrl(level)->SetItemState(*selectedIts,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE + | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); + + } + GetCtrl(level)->InsertItem(0,_T("Filter:")); + } + } + //================================================================ + void WxTreeView::OnBeginLabelEdit(wxListEvent& event) + { + GimmickDebugMessage(7, + "WxTreeView::OnBeginLabelEdit" + <GetNextItem(it, + wxLIST_NEXT_ALL); + if ( it == -1 ) + break; + if(it!=0) + { + long adr = GetCtrl(level)->GetItemData(it); + for (int j=1;jGetColumnCount()-1&&!contains;j++) + { + tree::Node* nod = ((ItemData*)adr)->node; + att=(*nod).GetAttribute(mLevelList[level].key[j-1]); + + if(att.find(filter)<900) + { + contains=true; + } + } + if(!contains) + { + GetCtrl(level)->DeleteItem(it); + } + } + } + GetGimmickView()->ClearSelection(); + //GetCtrl(level)->DeleteAllItems(); + + } + //================================================================ + void WxTreeView::ValidateSelectedImages() + { + GimmickDebugMessage(7, + "WxTreeView::ValidateSelectedImages" + < sel(GetSelected(mLevelList.size()+1)); + GetGimmickView()->OnSelectionChange(sel); + + } + //================================================================ - vtkImageData* WxTreeView::GetSelectedImage(int dim) + //================================================================ + void WxTreeView::GetNodes(std::vector& nodes, bool direction) { - /* - wxArrayTreeItemIds id; - // TO DO : TEST THAT STYLE IS MULTIPLE - unsigned int nb = mTreeListCtrl->GetSelections(id); - f.clear(); - - // Collect the brute vector of Image nodes - std::vector im; - for (unsigned int i=0; iGetItemData(id[i]); - if ((data) && (data->IsDicomNode())) - { - if (data->GetDicomNode()->GetType()==DicomNode::Image) - { - im.push_back ( data->GetDicomNode() ); + long item = mLastSelected; + int level=mLevelList.size()-1; + //Gets current item data + long adr = GetCtrl(level)->GetItemData(item); + //Extracts the node + tree::Node* nod = ((ItemData*)adr)->node; + for ( ;; ) + { + if(direction) + { + item = GetCtrl(level)->GetNextItem(item, + wxLIST_NEXT_ABOVE); + } + else + { + item = GetCtrl(level)->GetNextItem(item, + wxLIST_NEXT_BELOW); + } + if ( item == -1 ) + { + break; + } + if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 && item!=0) + { + adr = GetCtrl(level)->GetItemData(item); + nod = ((ItemData*)adr)->node; + nodes.push_back(nod); + } + } - } - else if (data->GetDicomNode()->GetType()==DicomNode::Series) - { - DicomNode::ChildrenListType::iterator j; - for (j =data->GetDicomNode()->GetChildrenList().begin(); - j!=data->GetDicomNode()->GetChildrenList().end(); - j++) - { - im.push_back ( *j ); - } - } - } - } - // Create the output data - if (im.size()==1) - { - // Only one image : give it - vtkImageData* out = vtkImageData::New(); - out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName())); - f.push_back( out ); - } - else if (im.size()>1) + } + + //================================================================ + void WxTreeView::GetSelectedAsString(std::vector&s) + { + int level=mLevelList.size(); + std::vector sel=GetSelected(level+1); + std::vector::iterator i; + + for (i=sel.begin(); i!=sel.end(); ++i) { - vtkImageData* first = mReader.GetImage( im.front()->ImageGetFullFileName() ); - if (first->GetDataDimension()==2) - { - // n2D to 3D - vtkImageData* out = vtkImageData::New(); - out->CopyStructure(first); - out->SetScalarType(first->GetScalarType()); - int ext[6]; - first->GetExtent(ext); - ext[5] = im.size(); - out->SetExtent(ext); - // LG : TODO : Z Spacing ? - - out->AllocateScalars(); - - //first->Print(std::cout); - // out->Print(std::cout); - - int dim[3]; - first->GetDimensions(dim); - unsigned long imsize = - ( (unsigned long)first->GetScalarPointer(0,1,0) - - (unsigned long)first->GetScalarPointer(0,0,0)) - *dim[1]; - - int slice = 0; - std::vector::iterator it; - for (it=im.begin(); it!=im.end(); ++it) - { - //std::cout << "copying slice "<ImageGetFullFileName() ); - - void* src = cur->GetScalarPointer(0,0,0); - void* dst = out->GetScalarPointer(0,0,slice); - // std::cout << "src="<::iterator it; - for (it=im.begin(); it!=im.end(); ++it) - { - vtkImageData* out = vtkImageData::New(); - out->ShallowCopy(mReader.GetImage((*it)->ImageGetFullFileName())); - f.push_back(out); - } - } - } - */ - return NULL; } - void WxTreeView::GetSelectedImages(std::vector& s, int dim) + //================================================================ + void WxTreeView::SetColor(int l) { + /* + int colorId=0; + //Setting the color according to the parent + if(l==0) + { + item.SetBackgroundColour + (wxColourDatabase().Find + (crea::std2wx(mColorPalette[colorId]))); + mColorMap.insert + (NodeColorPair + (*j,wxColourDatabase().Find + (crea::std2wx(mColorPalette[colorId])))); + if(colorId<64) + { + colorId++; + } + else + { + colorId=0; + } + } + else if(l!=mLevelList.size()-1) + { + item.SetBackgroundColour(mColorMap[*i]); + mColorMap.insert(NodeColorPair(*j,mColorMap[*i])); + } + else + { + item.SetBackgroundColour(mColorMap[*i]); + }*/ + } + //================================================================ + void WxTreeView::CreateColorPalette() + { + GimmickDebugMessage(6,"WxTreeView::CreateColorPalette"); + mColorPalette.push_back("WHITE"); + mColorPalette.push_back("LIGHT GREY"); + mColorPalette.push_back("AQUAMARINE"); + mColorPalette.push_back("MEDIUM FOREST GREEN"); + mColorPalette.push_back("INDIAN RED"); + mColorPalette.push_back("KHAKI"); + mColorPalette.push_back("ORANGE"); + mColorPalette.push_back("LIGHT BLUE"); + mColorPalette.push_back("LIGHT STEEL BLUE"); + mColorPalette.push_back("PINK"); + mColorPalette.push_back("PLUM"); + mColorPalette.push_back("PURPLE"); + mColorPalette.push_back("RED"); + mColorPalette.push_back("SEA GREEN"); + mColorPalette.push_back("SIENNA"); + mColorPalette.push_back("SKY BLUE"); + mColorPalette.push_back("SLATE BLUE"); + mColorPalette.push_back("SPRING GREEN"); + mColorPalette.push_back("TAN"); + mColorPalette.push_back("THISTLE"); + mColorPalette.push_back("TURQUOISE"); + mColorPalette.push_back("VIOLET"); + mColorPalette.push_back("VIOLET RED"); + mColorPalette.push_back("WHEAT"); + mColorPalette.push_back("YELLOW"); + mColorPalette.push_back("YELLOW GREEN"); + mColorPalette.push_back("BLUE"); + mColorPalette.push_back("BLUE VIOLET"); + mColorPalette.push_back("BROWN"); + mColorPalette.push_back("CADET BLUE"); + mColorPalette.push_back("CORAL"); + mColorPalette.push_back("CORNFLOWER BLUE"); + mColorPalette.push_back("CYAN"); + mColorPalette.push_back("DARK GREY"); + mColorPalette.push_back("DARK GREEN"); + mColorPalette.push_back("DARK OLIVE GREEN"); + mColorPalette.push_back("DARK ORCHID"); + mColorPalette.push_back("DARK SLATE BLUE"); + mColorPalette.push_back("DARK SLATE GREY"); + mColorPalette.push_back("DARK TURQUOISE"); + mColorPalette.push_back("FIREBRICK"); + mColorPalette.push_back("FOREST GREEN"); + mColorPalette.push_back("GOLD"); + mColorPalette.push_back("GOLDENROD"); + mColorPalette.push_back("GREY"); + mColorPalette.push_back("GREEN"); + mColorPalette.push_back("GREEN YELLOW"); + mColorPalette.push_back("LIME GREEN"); + mColorPalette.push_back("MAGENTA"); + mColorPalette.push_back("MAROON"); + mColorPalette.push_back("MEDIUM AQUAMARINE"); + mColorPalette.push_back("MEDIUM BLUE"); + mColorPalette.push_back("MEDIUM GOLDENROD"); + mColorPalette.push_back("MEDIUM ORCHID"); + mColorPalette.push_back("MEDIUM SEA GREEN"); + mColorPalette.push_back("MEDIUM SLATE BLUE"); + mColorPalette.push_back("MEDIUM SPRING GREEN"); + mColorPalette.push_back("MEDIUM TURQUOISE"); + mColorPalette.push_back("MEDIUM VIOLET RED"); + mColorPalette.push_back("MIDNIGHT BLUE"); + mColorPalette.push_back("NAVY"); + mColorPalette.push_back("ORANGE RED"); + mColorPalette.push_back("ORCHID, PALE GREEN"); + mColorPalette.push_back("STEEL BLUE"); + mColorPalette.push_back("BLACK"); + } + //================================================================ BEGIN_EVENT_TABLE(WxTreeView, wxPanel) /* EVT_SIZE(MyFrame::OnSize) @@ -700,8 +865,10 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag) EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag) - EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit) - EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit) + */ + EVT_LIST_BEGIN_LABEL_EDIT(-1, WxTreeView::OnBeginLabelEdit) + EVT_LIST_END_LABEL_EDIT(-1, WxTreeView::OnEndLabelEdit) + /* EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem) EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems) #if WXWIN_COMPATIBILITY_2_4 @@ -738,4 +905,3 @@ END_EVENT_TABLE() } // EO namespace creaImageIO -