From 71fb12908befc37ecb6021743cfc0704049db6e8 Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 17 Mar 2009 08:11:35 +0000 Subject: [PATCH] *** empty log message *** --- src2/creaImageIOWxTreeView.cpp | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 8f0e1f5..7a948f5 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -292,8 +292,8 @@ namespace creaImageIO GetCtrl(l)->DeleteAllItems(); std::vector::iterator i; - //Adds the first item (filter) - GetCtrl(l)->InsertItem(0, "Filter:"); + //Adds the first item (filter) + GetCtrl(l)->InsertItem(0, _T("Filter:")); for (i=sel.begin(); i!=sel.end(); ++i) { GimmickDebugMessage(2, @@ -343,20 +343,25 @@ namespace creaImageIO //Setting the color according to the parent if(l==0) { - item.SetBackgroundColour(wxColourDatabase().Find(mColorPalette[colorId])); - mColorMap.insert(NodeColorPair(*j,wxColourDatabase().Find(mColorPalette[colorId]))); - if(colorId<64) - { - colorId++; - } - else + 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; + colorId=0; } } else if(l!=mLevelList.size()-1) - { - item.SetBackgroundColour(mColorMap[*i]); + { + item.SetBackgroundColour(mColorMap[*i]); mColorMap.insert(NodeColorPair(*j,mColorMap[*i])); } else @@ -592,7 +597,7 @@ namespace creaImageIO | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); } - GetCtrl(level)->InsertItem(0,"Filter:"); + GetCtrl(level)->InsertItem(0,_T("Filter:")); } } @@ -621,7 +626,7 @@ namespace creaImageIO { if ( GetCtrl(level) == ctrl ) break; } - std::string filter=event.m_item.m_text.c_str(); + std::string filter = crea::wx2std(event.m_item.m_text.c_str()); std::string att; -- 2.46.1