Switched to libc++ in Makefile, fixed casting error in wxMessageBox

2019-01-09 10:57:28 +01:00
parent 6b57df374f
commit 9418b346bc
4 changed files with 2 additions and 2 deletions
@@ -1359,7 +1359,7 @@ void DOFrame::OnTimer(wxTimerEvent& event)

         str.Printf(wxT("This board was calibrated at %1.2lg V ... %1.2lg V\nYou must recalibrate the board if you use a different input range"), 
            GetOsci()->GetCalibratedInputRange()-0.5, GetOsci()->GetCalibratedInputRange()+0.5);
-         wxMessageBox((const wxChar*)wxString::FromAscii((const char*)str), wxT("DRS Oscilloscope Warning"), wxOK | wxICON_EXCLAMATION, this);
+         wxMessageBox(str, wxT("DRS Oscilloscope Warning"), wxOK | wxICON_EXCLAMATION, this);
      }
      
      // issue warning if timing calibration not valid