From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Thu, 8 Dec 2022 15:07:40 +0000 (+0100)
Subject: #3326 bbtk_Transform3Ddicom_PKG
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=33019c533de648d87cb588288edc54b3d655841a;hp=916db8ea8376e6a88a74f2b76b24d6e746041217;p=creaImageIO.git

#3326 bbtk_Transform3Ddicom_PKG
---

diff --git a/src/creaImageIOWxTreeView.cpp b/src/creaImageIOWxTreeView.cpp
index 3f98bd0..8dbc4af 100644
--- a/src/creaImageIOWxTreeView.cpp
+++ b/src/creaImageIOWxTreeView.cpp
@@ -44,34 +44,24 @@ namespace creaImageIO
 
 //=====================================================================
 ///Comparing function for ordering algorithm. Takes parameters as strings.
-int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
+//int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
+int wxCALLBACK CompareFunctionStrings(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
 {	
   creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1;
   creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2;
-
   const std::string& s1(*(data1->attr));
-  const std::string& s2(*(data2->attr));
-  
+  const std::string& s2(*(data2->attr));  
   if(sortData==1)
     {
       // inverse the order
-      if (s1 < s2)
-	return 1;
-      if (s1 > s2)
-	return -1;
-      
+      if (s1 < s2)  return 1;
+      if (s1 > s2)  return -1;
       return 0;
-    }
-  else
-    {
-      if (s1 < s2)
-	return -1;
-      if (s1 > s2)
-	return 1;
-      
+    }  else  {
+      if (s1 < s2)	return -1;
+      if (s1 > s2)	return 1;
       return 0;
-      
-    }
+    } // if sortData	
 }
 //=====================================================================
 
@@ -559,7 +549,8 @@ namespace creaImageIO
 			GetCtrl(l)->SetItem(item);
 		} // for k
 		item.Clear();
-	  } // for j
+  	  } // for j
+
     }  // for i
     SortLevel(l);
     GetCtrl(l)->Show();
@@ -780,7 +771,6 @@ namespace creaImageIO
       {
 	mLevelList[level].SortAscending = false;
       }
-	  
     SortLevel(level);
   }
   //================================================================
@@ -946,13 +936,11 @@ namespace creaImageIO
 			data->selected = true;
 			nbselected++;
 		} // if
-    }// for
-	
+    }// for	
     GimmickDebugMessage(1,
 			"WxTreeView::OnSort : " 
 			<<nbselected<<" selected before sorting"
 			<<std::endl);  
-
     mIgnoreSelectedChanged = true; 
     // 
     if (mLevelList[level].SortAscending)