std2wx

diff --git a/src2/creaImageIOWxAttributeSelectionPanel.h b/src2/creaImageIOWxAttributeSelectionPanel.h
index 8e3cf772a13057568dd06e0bf2943d9a0de574c0..5700fd52553fe09b8a289095c38fc34dc48d8e52 100644 (file)
--- a/src2/creaImageIOWxAttributeSelectionPanel.h
+++ b/src2/creaImageIOWxAttributeSelectionPanel.h
@@ -58,4 +58,5 @@ namespace creaImageIO
 
 #endif // USE_WIDGETS
 // EOF
-#endif  
\ No newline at end of file
+#endif
+

diff --git a/src2/creaImageIOWxCustomizeConfigPanel.cpp b/src2/creaImageIOWxCustomizeConfigPanel.cpp
index 8fd0e784620db99ae878543fb5616000c8661057..7ca2f2323a1f704fdc15ef0e2a39e00f83eb3334 100644 (file)
--- a/src2/creaImageIOWxCustomizeConfigPanel.cpp
+++ b/src2/creaImageIOWxCustomizeConfigPanel.cpp
@@ -28,16 +28,16 @@ namespace creaImageIO
     GimmickDebugMessage(1,"WxCustomizeConfigPanel::WxCustomizeConfigPanel"
                        <<std::endl);
        wxStaticText * cp=new wxStaticText(this,-1,_T(" Copy Path: "), wxPoint(5,10));
-    copyPath=new wxTextCtrl(this, wxID_ANY, _T(copyP), wxPoint(150,10), wxSize(250,20));
+    copyPath=new wxTextCtrl(this, wxID_ANY, crea::std2wx(copyP), wxPoint(150,10), wxSize(250,20));
 
        wxStaticText * dp=new wxStaticText(this,-1,_T(" Database Path: "), wxPoint(5,40));
-       dbPath=new wxTextCtrl(this, wxID_ANY, _T(databaseP), wxPoint(150,40), wxSize(250,20));
+       dbPath=new wxTextCtrl(this, wxID_ANY, crea::std2wx(databaseP), wxPoint(150,40), wxSize(250,20));
 
        wxStaticText * se=new wxStaticText(this,-1,_T(" Synchronization Event: "), wxPoint(5,70));
-       syncEvent=new wxTextCtrl(this, wxID_ANY, _T(syncEv), wxPoint(150,70), wxSize(250,20));
+       syncEvent=new wxTextCtrl(this, wxID_ANY, crea::std2wx(syncEv), wxPoint(150,70), wxSize(250,20));
 
        wxStaticText * sf=new wxStaticText(this,-1,_T(" Synchronization Frequency: "), wxPoint(5,100));
-       syncFrequency=new wxTextCtrl(this, wxID_ANY, _T(syncFr), wxPoint(150,100), wxSize(250,20));
+       syncFrequency=new wxTextCtrl(this, wxID_ANY, crea::std2wx(syncFr), wxPoint(150,100), wxSize(250,20));
 
        wxButton *save = new wxButton(this,wxID_ANY,_T("Save Changes"), wxPoint(5,130) );
        Connect( save->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxCustomizeConfigPanel::OnSaveConfig ); 

diff --git a/src2/creaImageIOWxCustomizeConfigPanel.h b/src2/creaImageIOWxCustomizeConfigPanel.h
index 0de052a65be0036f8fa999d2c95ff6128ceeb957..0152af1e26c0bfcadab02e8824b842185d78d974 100644 (file)
--- a/src2/creaImageIOWxCustomizeConfigPanel.h
+++ b/src2/creaImageIOWxCustomizeConfigPanel.h
@@ -51,4 +51,5 @@ namespace creaImageIO
 
 #endif // USE_WIDGETS
 // EOF
-#endif  
\ No newline at end of file
+#endif
+

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 9ada3c16b67eaf2f7738c1a6b0b10fff7739c66d..d6ddcdca3c63546ef537e9952cb46a975b484f47 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -915,7 +915,7 @@ namespace creaImageIO
   //========================================================================
   void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
   {
-         wxDialog* dial= new wxDialog (this,-1,_T("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
+         wxDialog* dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
     wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
     WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
 

diff --git a/src2/creaImageIOWxListenerPanel.cpp b/src2/creaImageIOWxListenerPanel.cpp
index f259388d6cc789eeb509b207f3ae89d5c3f01b31..86c5e9006527c5465c1a23053c5efb8379ba11a0 100644 (file)
--- a/src2/creaImageIOWxListenerPanel.cpp
+++ b/src2/creaImageIOWxListenerPanel.cpp
@@ -26,7 +26,7 @@ namespace creaImageIO
                _T("E:"), 
                _T("F:"), 
                _T("G:") };
-       drives=new wxComboBox(this, -1,"E:",wxPoint(100, 10),wxDefaultSize,4,choices);
+       drives=new wxComboBox(this, -1,_T("E:"),wxPoint(100, 10),wxDefaultSize,4,choices);
 
        addCheckBox = new wxCheckBox(this, -1, _T("Automatically add images to the database when CD/DVD is mounted?"), wxPoint(5,45) );
        addCheckBox->SetValue(true);
@@ -37,7 +37,7 @@ namespace creaImageIO
        std::string name;
        if (state){name="Start Monitoring Drive";}
        else {name="Stop Monitoring Drive";}
-       wxButton *start = new wxButton(this,wxID_ANY,_T(name), wxPoint(5,110) );
+       wxButton *start = new wxButton(this,wxID_ANY,crea::std2wx(name), wxPoint(5,110) );
        Connect( start->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxListenerPanel::OnChangeThreadState ); 
 
        wxButton *save = new wxButton(this,wxID_ANY,_T("Save Changes"), wxPoint(130,110) );

diff --git a/src2/creaImageIOWxListenerPanel.h b/src2/creaImageIOWxListenerPanel.h
index 17dff790631504fb36a9923d8280a726f696f26f..cf667943feb7bd81eda7818325c0357d1e0235ba 100644 (file)
--- a/src2/creaImageIOWxListenerPanel.h
+++ b/src2/creaImageIOWxListenerPanel.h
@@ -53,4 +53,6 @@ namespace creaImageIO
 
 #endif // USE_WIDGETS
 // EOF
-#endif  
\ No newline at end of file
+#endif
+
+