X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsSpreadPanel.cxx;h=aee83b84aad54bfe457cd87b91f287612874c709;hb=6169c4084c0371bd7bf8d961b4bad3a1f58ba12b;hp=20d6c8cda2beda7bb7ebcc8b7eaf493aaee5874b;hpb=89db06fc8f04c54d2cee1b07a5abe3ac7ee6cf65;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx b/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
index 20d6c8c..aee83b8 100644
--- a/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "interfToolsSpreadPanel.h"
 
 interfToolsSpreadPanel::interfToolsSpreadPanel(wxWindow * parent, int sizex, int sizey,wxEvtHandler* evtHandler)	
@@ -31,7 +56,7 @@ interfToolsSpreadPanel::~interfToolsSpreadPanel()
 }
 
 wxPanel* interfToolsSpreadPanel::initializeRadioBox(){
-	wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, _T(""));
+	wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 	wxString lstOptions[3];
 	lstOptions[0]=_T("A");
 	lstOptions[1]=_T("B");
@@ -44,20 +69,20 @@ wxPanel* interfToolsSpreadPanel::initializeRadioBox(){
 wxPanel* interfToolsSpreadPanel::initializeButton(std::string path, std::string nom){
 			
 
-	wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, _T(""));
+	wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 
 	wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1,2,2,2);	
 	panel->SetSizer(flexsizer, true);
 	panel->SetAutoLayout( true );
 	
-	wxBitmap* bitmap = new wxBitmap(path, wxBITMAP_TYPE_PNG);
+	wxBitmap* bitmap = new wxBitmap(wxString(path.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
 
 	wxBitmapButton* bitmapbutton = new wxBitmapButton(panel, -1, *bitmap, wxDefaultPosition, wxDefaultSize,
-										wxBU_AUTODRAW, wxDefaultValidator, _T(""));
+										wxBU_AUTODRAW, wxDefaultValidator, wxString(_T("")));
 
 	
-	wxStaticText* statictext = new wxStaticText(panel, -1, wxString(nom), wxDefaultPosition, 
-								wxDefaultSize, wxALIGN_CENTRE, wxString(nom));
+	wxStaticText* statictext = new wxStaticText(panel, -1, wxString(nom.c_str(),wxConvUTF8), wxDefaultPosition, 
+								wxDefaultSize, wxALIGN_CENTRE, wxString(nom.c_str(),wxConvUTF8));
 
 	
 	flexsizer->Add(bitmapbutton, wxFIXED_MINSIZE);
@@ -70,9 +95,9 @@ wxPanel* interfToolsSpreadPanel::initializeButton(std::string path, std::string
 
 wxPanel* interfToolsSpreadPanel::initializeAddRemoveContour(){
 	
-	wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE |wxVSCROLL , _T(""));
+	wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE |wxVSCROLL , wxString(_T("")));
 
-	scrollwin = new wxScrolledWindow(panel, -1, wxDefaultPosition, wxSize(80,50), wxVSCROLL, _T(""));
+	scrollwin = new wxScrolledWindow(panel, -1, wxDefaultPosition, wxSize(80,50), wxVSCROLL, wxString(_T("")));
 
 	checkboxsizer = new wxFlexGridSizer(0,1,2,2);	
 
@@ -88,8 +113,8 @@ wxPanel* interfToolsSpreadPanel::initializeAddRemoveContour(){
 void interfToolsSpreadPanel::addContourCheckBox(std::string id){
 
 
-	wxCheckBox* check = new wxCheckBox(scrollwin, -1, wxString(id), wxDefaultPosition, wxDefaultSize, 0,
-							wxDefaultValidator, wxString(id));
+	wxCheckBox* check = new wxCheckBox(scrollwin, -1, wxString(id.c_str(),wxConvUTF8), wxDefaultPosition, wxDefaultSize, 0,
+							wxDefaultValidator, wxString(id.c_str(),wxConvUTF8));
 
 	checkvect.push_back(id);