Ticket #22654: patch-gui-usbprogFrm.cc.diff
File patch-gui-usbprogFrm.cc.diff, 983 bytes (added by crazor@…, 15 years ago) |
---|
-
gui/usbprogFrm.cc
old new 285 285 286 286 // file dialog 287 287 m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"), 288 wxT(""), wxT(""), wxT("*.bin"), wx OPEN);288 wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN); 289 289 290 290 m_topBox->Add(topSizer, wxEXPAND, wxALL, 10); 291 291 … … 447 447 { 448 448 int number; 449 449 stringstream ss; 450 ss << m_deviceCombo->GetValue();450 ss << (const char *)m_deviceCombo->GetValue(); 451 451 ss >> number; 452 452 453 453 if (number < 0 || number >= int(m_deviceManager->getNumberUpdateDevices())) … … 620 620 dbg->setFileHandle(NULL); 621 621 } else { 622 622 wxFileDialog fdg(m_panel, wxT("Choose a file"), 623 wxT(""), wxT(""), wxT("*.log"), wx SAVE);623 wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE); 624 624 if (fdg.ShowModal() != wxID_OK) 625 625 dbg->setFileHandle(stderr); 626 626 else {