simspark-cvs

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6470

Modified Files:
	sparktree.cpp 
Log Message:
- wxWidgets unicode compile fixes (thanks Joschka)


Index: sparktree.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparktree.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sparktree.cpp	16 Jan 2006 11:35:55 -0000	1.1
--- sparktree.cpp	21 Jan 2006 13:53:52 -0000	1.2
***************
*** 75,79 ****
  
      mCore = spark->GetCore();
!     mRootId = mTree->AddRoot("/");
  
      shared_ptr<Leaf> root = mCore->GetRoot();
--- 75,79 ----
  
      mCore = spark->GetCore();
!     mRootId = mTree->AddRoot(_T("/"));
  
      shared_ptr<Leaf> root = mCore->GetRoot();
***************
*** 114,123 ****
          {
              shared_ptr<Leaf> child = (*iter);
!             wxString label = child->GetName();
  
              shared_ptr<Class> childClass = child->GetClass();
              if (childClass.get() != 0)
                  {
!                     label += " (" + childClass->GetName() + ")";
                  }
  
--- 114,125 ----
          {
              shared_ptr<Leaf> child = (*iter);
!             wxString label(child->GetName().c_str(), wxConvUTF8);
  
              shared_ptr<Class> childClass = child->GetClass();
              if (childClass.get() != 0)
                  {
!                     label << _T(" (") 
!                           << wxString(childClass->GetName().c_str(), wxConvUTF8) 
!                           << _T(")");
                  }
  
***************
*** 144,148 ****
          }
  
!     location = data->leaf.lock()->GetFullPath();
      return true;
  }
--- 146,150 ----
          }
  
!     location = wxString(data->leaf.lock()->GetFullPath().c_str(), wxConvUTF8);
      return true;
  }