Fixed popup position when enlarging.

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index d0a1402798eac2edc106cbd25b852a0a8545831b..852107bfcf48ec2c36e518cd58a560794819ac92 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -422,10 +422,6 @@ namespace creaImageIO
        GimmickDebugMessage(1,
                        " Level "<<level+1
                        <<std::endl);
-
-       GimmickMessage(1,
-                       " Event type "<<event.GetEventType()
-                       <<std::endl);
        /*
        if(event.m_itemIndex!=0)
        {*/
@@ -522,7 +518,10 @@ namespace creaImageIO
        {
        if ( GetCtrl(level) == senderCtrl ) break;
        }
-       clientpt.x+=(mColumnSelected)*(GetCtrl(0)->GetColumnWidth(mColumnSelected));
+       for(int i=0;i<mColumnSelected;i++)
+       {
+               clientpt.x+=GetCtrl(level)->GetColumnWidth(i);
+       }
        for(int i=0;i<level;i++)
        {
                clientpt.x+=GetSplitter(i)->GetSashPosition();
@@ -733,68 +732,7 @@ namespace creaImageIO
        }
        
    }
-  //================================================================
-  void WxTreeView::OnBeginLabelEdit(wxListEvent& event)
-  {
-       GimmickDebugMessage(7,
-                       "WxTreeView::OnBeginLabelEdit" 
-                       <<std::endl);
-       if(event.m_itemIndex!=0)
-       {
-               event.Veto();
-       }
-
-  }
-
-  //================================================================
-  void WxTreeView::OnEndLabelEdit(wxListEvent& event)
-  {
-         GimmickDebugMessage(7,
-                       "WxTreeView::OnEndLabelEdit" 
-                       <<std::endl);
-         wxObject* ctrl = event.GetEventObject(); 
-               unsigned int level = 0;
-               for (level = 0; level<mLevelList.size(); ++level)
-               {
-               if ( GetCtrl(level) == ctrl ) break;
-               }
-               std::string filter = crea::wx2std(event.m_item.m_text.c_str());
-               
-               std::string att;
-               
-               long it = -1;
-               UpdateLevel(level+1);
-               
-               for ( ;; )
-               {
-                       bool contains=false;
-                       it = GetCtrl(level)->GetNextItem(it,
-                                                                               wxLIST_NEXT_ALL);
-                       if ( it == -1 )
-                               break;
-                       if(it!=0)
-                       {
-                               long adr = GetCtrl(level)->GetItemData(it);
-                               for (int j=1;j<GetCtrl(level)->GetColumnCount()-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(bool isSelection)
   {
@@ -1008,10 +946,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(-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

diff --git a/src2/creaImageIOWxTreeView.h b/src2/creaImageIOWxTreeView.h
index dbd016242c4cd69ec619dde6edc48aa3dbb8aa73..3e6c10675f606c41552103a6970faf7c32914234 100644 (file)
--- a/src2/creaImageIOWxTreeView.h
+++ b/src2/creaImageIOWxTreeView.h
@@ -42,12 +42,6 @@ namespace creaImageIO
          /// Callback for column click
       void OnColClick(wxListEvent& event);
 
-         /// Callback for first item edition
-         void OnBeginLabelEdit(wxListEvent& event);
-
-         /// Callback when first item edition ends
-         void OnEndLabelEdit(wxListEvent& event);
-
          /// Callback when the user needs the items sorted
          void OnPopupSort(wxCommandEvent& event);