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

Update new version: 3.15.02

File:
1 edited

Legend:

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

    r130 r3185  
    8080std::map<int, std::pair<std::function<void(wxTextEntry*)>, wxChar>> keyboardCommands;
    8181
     82#ifdef __WXMAC__
    8283wxTextEntry* GetSpecialTextEntry(wxWindow* w, wxChar cmd)
    8384{
    84 #ifdef __WXMAC__
    85         if( cmd == 'A' || cmd == 'V' ) {
     85        if (cmd == 'A' || cmd == 'V') {
    8686                wxTextCtrl* text = dynamic_cast<wxTextCtrl*>(w);
    87                 if( text && text->GetWindowStyle() & wxTE_PASSWORD ) {
     87                if (text && text->GetWindowStyle() & wxTE_PASSWORD) {
    8888                        return text;
    8989                }
    9090        }
    91         wxComboBox* combo = dynamic_cast<wxComboBox*>(w);
    92         if( combo ) {
    93                 return combo;
    94         }
    95 #endif
     91        return dynamic_cast<wxComboBox*>(w);
     92}
     93#else
     94wxTextEntry* GetSpecialTextEntry(wxWindow*, wxChar)
     95{
    9696        return 0;
    9797}
     98#endif
    9899
    99100bool HandleKeyboardCommand(wxCommandEvent& event, wxWindow& parent)
    100101{
    101102        auto const& it = keyboardCommands.find(event.GetId());
    102         if( it == keyboardCommands.end() ) {
     103        if (it == keyboardCommands.end()) {
    103104                return false;
    104105        }
    105106
    106107        wxTextEntry* e = GetSpecialTextEntry(parent.FindFocus(), it->second.second);
    107         if( e ) {
     108        if (e) {
    108109                it->second.first(e);
    109110        }
     
    13981399        }
    13991400#endif
     1401        (void)e;
    14001402        OpenSiteManager();
    14011403}
     
    15381540}
    15391541
    1540 void CMainFrame::OnToggleQueueView(wxCommandEvent& event)
     1542void CMainFrame::OnToggleQueueView(wxCommandEvent&)
    15411543{
    15421544        if (!m_pBottomSplitter)
     
    16151617
    16161618#if FZ_MANUALUPDATECHECK
    1617 void CMainFrame::OnCheckForUpdates(wxCommandEvent& event)
    1618 {
    1619         if( !m_pUpdater ) {
     1619void CMainFrame::OnCheckForUpdates(wxCommandEvent&)
     1620{
     1621        if (!m_pUpdater) {
    16201622                return;
    16211623        }
    16221624
    16231625        update_dialog_timer_.Stop();
    1624         CUpdateDialog dlg( this, *m_pUpdater );
     1626        CUpdateDialog dlg(this, *m_pUpdater);
    16251627        dlg.ShowModal();
    16261628        update_dialog_timer_.Stop();
    16271629}
    16281630
    1629 void CMainFrame::UpdaterStateChanged( UpdaterState s, build const& v )
     1631void CMainFrame::UpdaterStateChanged(UpdaterState s, build const& v)
    16301632{
    16311633#if FZ_AUTOUPDATECHECK
     
    21412143}
    21422144
    2143 void CMainFrame::OnToolbarComparison(wxCommandEvent& event)
     2145void CMainFrame::OnToolbarComparison(wxCommandEvent&)
    21442146{
    21452147        CState* pState = CContextManager::Get()->GetCurrentContext();
     
    22502252}
    22512253
    2252 void CMainFrame::OnDropdownComparisonHide(wxCommandEvent& event)
     2254void CMainFrame::OnDropdownComparisonHide(wxCommandEvent&)
    22532255{
    22542256        CState* pState = CContextManager::Get()->GetCurrentContext();
     
    23422344}
    23432345
    2344 void CMainFrame::OnFilterRightclicked(wxCommandEvent& event)
     2346void CMainFrame::OnFilterRightclicked(wxCommandEvent&)
    23452347{
    23462348        const bool active = CFilterManager::HasActiveFilters();
     
    24002402#endif
    24012403
    2402 void CMainFrame::OnSyncBrowse(wxCommandEvent& event)
     2404void CMainFrame::OnSyncBrowse(wxCommandEvent&)
    24032405{
    24042406        CState* pState = CContextManager::Get()->GetCurrentContext();
     
    24742476
    24752477#ifdef __WXGTK__
    2476 void CMainFrame::OnTaskBarClick_Delayed(wxCommandEvent& event)
     2478void CMainFrame::OnTaskBarClick_Delayed(wxCommandEvent&)
    24772479{
    24782480        m_taskbar_is_uniconizing = false;
     
    24822484#endif
    24832485
    2484 void CMainFrame::OnSearch(wxCommandEvent& event)
     2486void CMainFrame::OnSearch(wxCommandEvent&)
    24852487{
    24862488        CState* pState = CContextManager::Get()->GetCurrentContext();
     
    25232525}
    25242526
    2525 void CMainFrame::OnMenuNewTab(wxCommandEvent& event)
     2527void CMainFrame::OnMenuNewTab(wxCommandEvent&)
    25262528{
    25272529        if (m_pContextControl)
Note: See TracChangeset for help on using the changeset viewer.