move directory

[creaImageIO.git] / src2 / creaImageIOWxAttributeSelectionPanel.cpp

diff --git a/src2/creaImageIOWxAttributeSelectionPanel.cpp b/src2/creaImageIOWxAttributeSelectionPanel.cpp
index 5697893fd4040412fbf068df90c0b3f11602f26f..87203d10638de5df9bc8a836809c84614950e743 100644 (file)
--- a/src2/creaImageIOWxAttributeSelectionPanel.cpp
+++ b/src2/creaImageIOWxAttributeSelectionPanel.cpp
@@ -1,6 +1,7 @@
 #include <creaImageIOWxAttributeSelectionPanel.h>
 #include <creaImageIOSystem.h>
 
+
 namespace creaImageIO
 {
        const int  ID_COMBO             = 180;
@@ -34,10 +35,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 +91,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 +120,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)