Some fixes for wxString vs std::string pb.

[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 73e94efeb83e7f40e6880d0e14037fb6a0b775e2..20d6c8cda2beda7bb7ebcc8b7eaf493aaee5874b 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsSpreadPanel.cxx
@@ -31,12 +31,12 @@ interfToolsSpreadPanel::~interfToolsSpreadPanel()
 }
 
 wxPanel* interfToolsSpreadPanel::initializeRadioBox(){
-       wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
+       wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, _T(""));
        wxString lstOptions[3];
-       lstOptions[0]="A";
-       lstOptions[1]="B";
-       lstOptions[2]="C";
-       wxRadioBox* _spreadMethodRadiobox       = new wxRadioBox(panel, -1, "Method", wxDefaultPosition, wxSize(45,80), 3 , lstOptions,  3, wxRA_SPECIFY_ROWS);
+       lstOptions[0]=_T("A");
+       lstOptions[1]=_T("B");
+       lstOptions[2]=_T("C");
+       wxRadioBox* _spreadMethodRadiobox       = new wxRadioBox(panel, -1, _T("Method"), wxDefaultPosition, wxSize(45,80), 3 , lstOptions,  3, wxRA_SPECIFY_ROWS);
        _spreadMethodRadiobox->SetSelection(2);
        return panel;
 }
@@ -44,7 +44,7 @@ wxPanel* interfToolsSpreadPanel::initializeRadioBox(){
 wxPanel* interfToolsSpreadPanel::initializeButton(std::string path, std::string nom){
                        
 
-       wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
+       wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, _T(""));
 
        wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1,2,2,2);      
        panel->SetSizer(flexsizer, true);
@@ -53,7 +53,7 @@ wxPanel* interfToolsSpreadPanel::initializeButton(std::string path, std::string
        wxBitmap* bitmap = new wxBitmap(path, wxBITMAP_TYPE_PNG);
 
        wxBitmapButton* bitmapbutton = new wxBitmapButton(panel, -1, *bitmap, wxDefaultPosition, wxDefaultSize,
-                                                                               wxBU_AUTODRAW, wxDefaultValidator, wxString(""));
+                                                                               wxBU_AUTODRAW, wxDefaultValidator, _T(""));
 
        
        wxStaticText* statictext = new wxStaticText(panel, -1, wxString(nom), wxDefaultPosition, 
@@ -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 , wxString(""));
+       wxPanel* panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE |wxVSCROLL , _T(""));
 
-       scrollwin = new wxScrolledWindow(panel, -1, wxDefaultPosition, wxSize(80,50), wxVSCROLL, wxString(""));
+       scrollwin = new wxScrolledWindow(panel, -1, wxDefaultPosition, wxSize(80,50), wxVSCROLL, _T(""));
 
        checkboxsizer = new wxFlexGridSizer(0,1,2,2);