diff --git a/src/DOScreen.cpp b/src/DOScreen.cpp
index 0147c29..3f6b665 100644
--- a/src/DOScreen.cpp
+++ b/src/DOScreen.cpp
@@ -110,7 +110,7 @@ void DOScreen::OnPaint(wxPaintEvent& event)
// Change "Save" button
if (!m_frame->GetWFfd() && !m_frame->GetWFFile())
- m_frame->SetSaveBtn("Save", "Save waveforms");
+ m_frame->SetSaveBtn(wxT("Save"), wxT("Save waveforms"));
}
/*------------------------------------------------------------------*/
@@ -347,7 +347,7 @@ void DOScreen::DrawScopeBottom(wxDC& dc, int board, int x1, int y1, int width, b
}
x_start = x_start - 15 - w;
if (m_frame->GetNSaved()) {
- wxst.Printf("%d saved", m_frame->GetNSaved());
+ wxst.Printf(wxT("%d saved"), m_frame->GetNSaved());
dc.GetTextExtent(wxst, &w, &h);
dc.DrawRoundedRectangle(x_start-20-w, y1+3, w+10, 15, 2);
dc.DrawText(wxst, x_start-15-w, y1+3);
diff --git a/src/TriggerDialog.cpp b/src/TriggerDialog.cpp
index 7aeb33e..32b41fa 100644
--- a/src/TriggerDialog.cpp
+++ b/src/TriggerDialog.cpp
@@ -26,13 +26,13 @@ TriggerDialog_fb( parent )
m_cbANDEXT->SetValue((tc & (1<<12))>0);
wxString s;
- s.Printf("%1.3lf", m_frame->GetTrgLevel(0));
+ s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(0));
m_tbLevel1->SetValue(s);
- s.Printf("%1.3lf", m_frame->GetTrgLevel(1));
+ s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(1));
m_tbLevel2->SetValue(s);
- s.Printf("%1.3lf", m_frame->GetTrgLevel(2));
+ s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(2));
m_tbLevel3->SetValue(s);
- s.Printf("%1.3lf", m_frame->GetTrgLevel(3));
+ s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(3));
m_tbLevel4->SetValue(s);
}
@@ -49,19 +49,19 @@ void TriggerDialog::OnButton( wxCommandEvent& event )
void TriggerDialog::OnTriggerLevel( wxCommandEvent& event )
{
if (event.GetId() == ID_LEVEL1)
- m_frame->SetTrgLevel(0, atof(m_tbLevel1->GetValue()));
+ m_frame->SetTrgLevel(0, atof(m_tbLevel1->GetValue().mb_str()));
if (event.GetId() == ID_LEVEL2)
- m_frame->SetTrgLevel(1, atof(m_tbLevel2->GetValue()));
+ m_frame->SetTrgLevel(1, atof(m_tbLevel2->GetValue().mb_str()));
if (event.GetId() == ID_LEVEL3)
- m_frame->SetTrgLevel(2, atof(m_tbLevel3->GetValue()));
+ m_frame->SetTrgLevel(2, atof(m_tbLevel3->GetValue().mb_str()));
if (event.GetId() == ID_LEVEL4)
- m_frame->SetTrgLevel(3, atof(m_tbLevel4->GetValue()));
+ m_frame->SetTrgLevel(3, atof(m_tbLevel4->GetValue().mb_str()));
}
void TriggerDialog::SetTriggerLevel(double level)
{
wxString s;
- s.Printf("%1.3lf", level);
+ s.Printf(wxT("%1.3lf"), level);
m_tbLevel1->SetValue(s);
m_tbLevel2->SetValue(s);
m_tbLevel3->SetValue(s);
|