Ignore:
Timestamp:
Jan 9, 2017, 11:09:38 AM (3 years ago)
Author:
jrpelegrina
Message:

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/interface/fileexistsdlg.cpp

    r130 r3185  
    3636}
    3737
    38 void CFileExistsDlg::DisplayFile(bool left, wxString name, int64_t size, CDateTime const& time, wxString const& iconFile)
     38void CFileExistsDlg::DisplayFile(bool left, wxString name, int64_t size, fz::datetime const& time, wxString const& iconFile)
    3939{
    4040        name = GetPathEllipsis(name, FindWindow(left ? XRCID("ID_FILE1_NAME") : XRCID("ID_FILE2_NAME")));
     
    4848
    4949        wxString timeStr = _("Date/time unknown");
    50         if (time.IsValid())
     50        if (time.empty())
    5151                timeStr = CTimeFormat::Format(time);
    5252
     
    8989        SHFILEINFO fileinfo;
    9090        memset(&fileinfo, 0, sizeof(fileinfo));
    91         if (SHGetFileInfo(file, FILE_ATTRIBUTE_NORMAL, &fileinfo, sizeof(fileinfo), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES)) {
     91        if (SHGetFileInfo(file.wc_str(), FILE_ATTRIBUTE_NORMAL, &fileinfo, sizeof(fileinfo), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES)) {
    9292                wxBitmap bmp;
    9393                bmp.Create(size.x, size.y);
     
    164164}
    165165
    166 void CFileExistsDlg::OnOK(wxCommandEvent& event)
     166void CFileExistsDlg::OnOK(wxCommandEvent&)
    167167{
    168168        if (xrc_call(*this, "ID_ACTION1", &wxRadioButton::GetValue))
     
    194194}
    195195
    196 void CFileExistsDlg::OnCancel(wxCommandEvent& event)
     196void CFileExistsDlg::OnCancel(wxCommandEvent&)
    197197{
    198198        m_action = CFileExistsNotification::skip;
Note: See TracChangeset for help on using the changeset viewer.