Ticket #5496: out.patch

interface/LocalListView.cpp

@@ -1269 +1269 @@
 
 void CLocalListView::OnKeyDown(wxKeyEvent& event)
 {
-#ifdef __WXMAC__
-#define CursorModifierKey wxMOD_CMD
-#else
-#define CursorModifierKey wxMOD_ALT
-#endif
-
     const int code = event.GetKeyCode();
     if (code == WXK_DELETE)
     {
@@ -1292 +1286 @@
         wxCommandEvent tmp;
         OnMenuRename(tmp);
     }
-    else if (code == WXK_RIGHT && event.GetModifiers() == CursorModifierKey)
-    {
-        wxListEvent evt;
-        evt.m_itemIndex = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
-        OnItemActivated(evt);
-    }
-    else if (code == WXK_DOWN && event.GetModifiers() == CursorModifierKey)
-    {
-        wxCommandEvent cmdEvent;
-        OnMenuUpload(cmdEvent);
-    }
     else
         event.Skip();
 }
@@ -2042 +2025 @@
     for (std::list<CLocalFileData>::const_iterator data = selected_item_list.begin(); data != selected_item_list.end(); data++)
     {
         wxFileName fn(m_dir, data->name);
-        
-#ifdef __WXMSW__
-        fn.SetExt( fn.GetExt( ).Lower() );
-#endif
-        
+
         bool dangerous = false;
         bool program_exists = false;
         wxString cmd = pEditHandler->CanOpen(CEditHandler::local, fn.GetFullPath(), dangerous, program_exists);

interface/settings/optionspage_filetype.cpp

@@ -143 +143 @@
 void COptionsPageFiletype::OnAdd(wxCommandEvent& event)
 {
     wxString ext = GetText(XRCID("ID_EXTENSION"));
-        
     if (ext == _T(""))
     {
         wxBell();
         return;
     }
-    
-#ifdef __WXMSW__
-    ext = ext.Lower();
-#endif
-    
+
     wxListCtrl* pListCtrl = XRCCTRL(*this, "ID_EXTENSIONS", wxListCtrl);
     wxASSERT(pListCtrl);