Ticket #22654: patch-gui-usbprogFrm.cc.diff

File patch-gui-usbprogFrm.cc.diff, 983 bytes (added by crazor@…, 14 years ago)

wxWidgets changed some constants, added typecast to fix ambiguous overloaded operator<< error

  • gui/usbprogFrm.cc

    old new  
    285285
    286286    // file dialog
    287287        m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
    288             wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
     288            wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN);
    289289
    290290    m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
    291291
     
    447447{
    448448    int number;
    449449    stringstream ss;
    450     ss << m_deviceCombo->GetValue();
     450    ss << (const char *)m_deviceCombo->GetValue();
    451451    ss >> number;
    452452
    453453    if (number < 0 || number >= int(m_deviceManager->getNumberUpdateDevices()))
     
    620620        dbg->setFileHandle(NULL);
    621621    } else {
    622622        wxFileDialog fdg(m_panel, wxT("Choose a file"),
    623             wxT(""), wxT(""), wxT("*.log"), wxSAVE);
     623            wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE);
    624624        if (fdg.ShowModal() != wxID_OK)
    625625            dbg->setFileHandle(stderr);
    626626        else {