X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxAttributeSelectionPanel.cpp;h=0d6fa7cbeb60c63fc6b227d83334570963017013;hb=33867ec27dd1743cd11b50939fdbb0f9ebd549f2;hp=5697893fd4040412fbf068df90c0b3f11602f26f;hpb=381f766db11094bd9b96f9e948527cbec24f680a;p=creaImageIO.git

diff --git a/src2/creaImageIOWxAttributeSelectionPanel.cpp b/src2/creaImageIOWxAttributeSelectionPanel.cpp
index 5697893..0d6fa7c 100644
--- a/src2/creaImageIOWxAttributeSelectionPanel.cpp
+++ b/src2/creaImageIOWxAttributeSelectionPanel.cpp
@@ -34,10 +34,10 @@ namespace creaImageIO
 	for(int i=1;i<=numLev;i++)
 	{
 		out<<i;
-		as.Add(out.str());
+		as.Add(crea::std2wx(out.str()));
 		out.str("");
 	}
-	levels=new wxComboBox(this, ID_COMBO,"1",wxPoint(190, 5),wxDefaultSize,as);
+	levels=new wxComboBox(this, ID_COMBO,_T("1"),wxPoint(190, 5),wxDefaultSize,as);
 	wxStaticText * na=new wxStaticText(this,-1,_T(" Currently hidden attributes: "), wxPoint(255,10));
 
     shownAtts=new wxListCtrl(this, wxID_ANY, wxPoint(5,30), wxSize(160,90), wxLC_REPORT | wxLC_NO_HEADER );
@@ -90,12 +90,12 @@ namespace creaImageIO
 	for ( ;; )
 	{
 		item = shownAtts->GetNextItem(item,
-										wxLIST_NEXT_ALL,
-										wxLIST_STATE_SELECTED);
+			wxLIST_NEXT_ALL,
+			wxLIST_STATE_SELECTED);
 		if ( item == -1 )
 			break;
 	
-			std::string change=shownAtts->GetItemText(item);
+			std::string change = crea::wx2std(shownAtts->GetItemText(item));
 			std::vector<std::string>::iterator it;
 			bool found=false;
 			for(it=shownA.begin();it!=shownA.end()&&!found;++it)
@@ -119,12 +119,12 @@ namespace creaImageIO
 	for ( ;; )
 	{
 		item = notShownAtts->GetNextItem(item,
-										wxLIST_NEXT_ALL,
-										wxLIST_STATE_SELECTED);
+			wxLIST_NEXT_ALL,
+			wxLIST_STATE_SELECTED);
 		if ( item == -1 )
 			break;
 	
-			std::string change=notShownAtts->GetItemText(item);
+			std::string change = crea::wx2std(notShownAtts->GetItemText(item));
 			std::vector<std::string>::iterator it;
 			bool found=false;
 			for(it=notShownA.begin();it!=notShownA.end()&&!found;++it)