std::string vs wxString

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxEditionDialog.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx
index 66a8fb0e46295de7cfe1fbb1564abc8c78565878..d5e5cbd4eaadcc16850ce14bed4be065c77a0a6c 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx
@@ -33,29 +33,28 @@ Version:   $Revision$
 *  \brief Class bbtk::wxEditionDialog . 
 */
 
-
 #include "wxEditionDialog.h"
-
+#include "creaWx.h"
 
 namespace bbtk
 {
        //=========================================================================
 
-       wxEditionDialog::wxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,"", wxDefaultPosition, wxSize(480, 640))
+       wxEditionDialog::wxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 640))
        {
                _model=model;
-               std::string title = "BlackBox Editing - Name:";
+               std::string title("BlackBox Editing - Name:");
                title+=_model->getBBTKName();
                title+=" Type:";
                title+=_model->getBBTKType();
-               SetTitle(wxT(title));
+               SetTitle(std2wx(title));
 
                constructBlackBoxEditionDialog();
        }
 
        //=========================================================================
 
-       wxEditionDialog::wxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene):wxDialog(parent, wxID_ANY, "", wxDefaultPosition, wxSize(300, 300))
+       wxEditionDialog::wxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene):wxDialog(parent, wxID_ANY, _T(""), wxDefaultPosition, wxSize(300, 300))
        {
                
        }
@@ -73,26 +72,26 @@ namespace bbtk
        {
                wxBoxSizer *sizerDialog = new wxBoxSizer(wxVERTICAL);
 
-               wxStaticText *text = new wxStaticText(this, -1, wxT("Input Ports"));
+               wxStaticText *text = new wxStaticText(this, -1, _T("Input Ports"));
                                
                std::vector<GPortModel*> lstInputs = _model->getInputPorts();
                wxGridSizer *sizer = new wxGridSizer(lstInputs.size(),3,5,5);             
                for(int i = 0;i<lstInputs.size();i++)
                {
                        GPortModel* port = lstInputs[i];
-                       wxStaticText *lblName = new wxStaticText(this, -1, wxT(port->getBBTKName()),wxDefaultPosition,wxSize(100,30));
-                       wxStaticText *lblType = new wxStaticText(this, -1, wxT(port->getBBTKType()),wxDefaultPosition,wxSize(150,30));
-                       wxTextCtrl *txtValue = new wxTextCtrl(this, -1, wxT(""),wxDefaultPosition,wxSize(50,15));
+                       wxStaticText *lblName = new wxStaticText(this, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(100,30));
+                       wxStaticText *lblType = new wxStaticText(this, -1, std2wx(port->getBBTKType()),wxDefaultPosition,wxSize(150,30));
+                       wxTextCtrl *txtValue = new wxTextCtrl(this, -1, _T(""),wxDefaultPosition,wxSize(50,15));
 
                        if(port->getValue()!="")
                        {
-                               txtValue->SetLabel(wxT(port->getValue()));
+                               txtValue->SetLabel(crea::std2wx(port->getValue()));
                        }
 
                        if(port->isConnected())
                        {
-                               std::string connected = "--Port Connected--";
-                               txtValue->SetLabel(wxT(connected));
+                               std::string connected("--Port Connected--");
+                               txtValue->SetLabel(crea::std2wx(connected));
                                txtValue->SetEditable(false);
                        }
 
@@ -103,12 +102,11 @@ namespace bbtk
                        sizer->Add(lblName,0,wxEXPAND,5);
                        sizer->Add(lblType,0,wxCENTRE|wxEXPAND,5);
                        sizer->Add(txtValue,0,wxEXPAND,5);
-
                }
                
                wxBoxSizer *buts = new wxBoxSizer(wxHORIZONTAL);
-               wxButton *okButton = new wxButton(this, 1003, wxT("Ok"),wxDefaultPosition, wxSize(70, 30));
-               wxButton *closeButton = new wxButton(this, 1004, wxT("Close"), wxDefaultPosition, wxSize(70, 30));
+               wxButton *okButton = new wxButton(this, 1003, _T("Ok"),wxDefaultPosition, wxSize(70, 30));
+               wxButton *closeButton = new wxButton(this, 1004, _T("Close"), wxDefaultPosition, wxSize(70, 30));
 
                // connect command event handlers
                Connect(1003,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxEditionDialog::onClickOk));
@@ -127,7 +125,6 @@ namespace bbtk
                Centre();
                ShowModal();
                Destroy();
-
        }
 
        //=========================================================================
@@ -137,7 +134,7 @@ namespace bbtk
 
                for(int i=0;i<_lstValues.size();i++)
                {
-                       std::string text = _lstValues[i]->GetLabelText();               
+                       std::string text = wx2std(_lstValues[i]->GetLabelText());               
                        _model->setValueToInputPort(i,text);
                }
 
@@ -156,4 +153,3 @@ namespace bbtk
 }  // EO namespace bbtk
 
 // EOF
-