85%

[creaContours.git] / lib / Interface_Icons_NDimensions / interfToolsSpreadPanel.cxx

diff --git a/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx b/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
index 20d6c8cda2beda7bb7ebcc8b7eaf493aaee5874b..f00b780b3ae35dd87efecbc21b4a74586ec57922 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
@@ -31,7 +31,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 +44,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 +70,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 +88,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);