85%

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

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index 720c24e3e878e814a1acee3e63e7d6e11751d64a..e4fe6a5d4dd73f20e7029c57fa3556d8110d5f47 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -24,12 +24,12 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
        PANEL4 = "Tools";  
        PANEL5 = "Segmentation";
 
-       splitterwindow = new wxSplitterWindow(this,-1, wxDefaultPosition, wxSize(sizex, sizey), wxSP_3DSASH, wxString(""));
+       splitterwindow = new wxSplitterWindow(this,-1, wxDefaultPosition, wxSize(sizex, sizey), wxSP_3DSASH, wxString(_T("")));
        
        sizey = sizey/8;
        currentWindow = NULL;
 
-       wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
+       wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 
        wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6,2,1,1);      
        toolpanel->SetSizer(flexsizer, true);
@@ -48,12 +48,12 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
        wxButton* b5 = getButton(toolpanel);
        b5->SetClientData(&PANEL5);
 
-       wxPanel* mentex = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
-       wxPanel* mentex1 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
-       wxPanel* mentex2 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
-       wxPanel* mentex3 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
-       wxPanel* mentex4 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
-       wxPanel* mentex5 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(""));
+       wxPanel* mentex = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+       wxPanel* mentex1 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+       wxPanel* mentex2 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+       wxPanel* mentex3 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+       wxPanel* mentex4 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+       wxPanel* mentex5 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
        
        menubar = new interfNewContourMenu(mentex, sizex, sizey, evtHandler, datadir);          
        menubar1 = new interfIOMenu(mentex1, sizex, sizey, evtHandler, datadir);        
@@ -90,7 +90,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
        toolpanel->Update();
        toolpanel->Layout();
 
-       infoPanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(""));
+       infoPanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
        wxFlexGridSizer* infosizer = new wxFlexGridSizer(1,1,2,2);      
        infoPanel->SetSizer(infosizer, true);
        infoPanel->SetAutoLayout( true );       
@@ -238,7 +238,7 @@ interfMainPanel* interfMainPanel::getInstance(){
 wxPanel* interfMainPanel::initializeToolsPanel(wxWindow* parent, int sizex, int sizey, wxEvtHandler * evtHandler){
 
 
-       wxPanel* panel = new wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN, wxString("Spread"));
+       wxPanel* panel = new wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN, wxString(_T("Spread")));
 
        wxFlexGridSizer* flexsizer = new wxFlexGridSizer(2,1,2,2)       ;
        panel->SetSizer(flexsizer, true);
@@ -283,34 +283,34 @@ void interfMainPanel::onActionButtonPressed1( wxCommandEvent& event ){
        int sizechange=0;
 
 
-       if(dstring==PANEL){
+       if(dstring.compare(PANEL)==0){
                dmenu = menubar;
                text = statictext;
-       }else if( dstring==PANEL1){
+       }else if(dstring.compare(PANEL1)==0 ){
                dmenu = menubar1;       
                text = statictext1;
-       }else if(dstring==PANEL2){
+       }else if(dstring.compare(PANEL2)==0){
                dmenu = menubar2;
                text = statictext2;
-       }else if(dstring==PANEL3){
+       }else if(dstring.compare(PANEL3)==0){
                dmenu = menubar3;
                text = statictext3;
-       }else if(dstring==PANEL4){
+       }else if(dstring.compare(PANEL4)==0){
                dmenu = menubar4;
                text = statictext4;
-       }else if(dstring==PANEL5){
+       }else if(dstring.compare(PANEL5)==0){
                dmenu = menubar5;
                text = statictext5;
        }
 
-       if(b->GetLabel() == "+" ){
+       if(wxStrcmp(b->GetLabel(),_T("+"))==0 ){
                dmenu->Show(true);
                sizechange = 1;
-               b->SetLabel("-");
+               b->SetLabel(_T("-"));
        }else{
                dmenu->Show(false);             
                sizechange = -1;
-               b->SetLabel("+");
+               b->SetLabel(_T("+"));
        }       
        
        sizechange *= dmenu->GetSize().GetHeight();
@@ -321,13 +321,13 @@ void interfMainPanel::onActionButtonPressed1( wxCommandEvent& event ){
 }
 
 wxStaticText* interfMainPanel::getText(wxWindow* parent, std::string nom){
-       return new wxStaticText(parent, -1, wxString(nom), wxDefaultPosition, 
-                                                       wxDefaultSize, wxALIGN_CENTRE, wxString(nom));
+       return new wxStaticText(parent, -1, wxString(nom.c_str(),wxConvUTF8), wxDefaultPosition, 
+                                                       wxDefaultSize, wxALIGN_CENTRE, wxString(nom.c_str(),wxConvUTF8));
 }
 
 wxButton* interfMainPanel::getButton(wxWindow* parent){
-       wxButton* b = new wxButton(parent, -1, wxString("-"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, 
-                                                               wxDefaultValidator, wxString("-"));     
+       wxButton* b = new wxButton(parent, -1, wxString(_T("-")), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, 
+                                                               wxDefaultValidator, wxString(_T("-"))); 
        return b;
 }