diff options
author | Moonchild <moonchild@palemoon.org> | 2021-05-03 12:26:37 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2021-05-03 12:26:37 +0000 |
commit | aa0fd3d68c856504646e1d7eb499bc890ef44101 (patch) | |
tree | 70066c56efbbfe430472baac892e32a3bab4f04f /layout/forms | |
parent | 1bf0734a7249eb0dc1a96d825e7310eb46cac6dc (diff) | |
download | uxp-aa0fd3d68c856504646e1d7eb499bc890ef44101.tar.gz |
Issue #1751 -- Remove XP_MACOSX conditionals from /layout
Diffstat (limited to 'layout/forms')
-rw-r--r-- | layout/forms/nsListControlFrame.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 4daa470a9e..12fc4a2dde 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -842,11 +842,7 @@ nsListControlFrame::HandleListSelection(nsIDOMEvent* aEvent, nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aEvent); bool isShift; bool isControl; -#ifdef XP_MACOSX - mouseEvent->GetMetaKey(&isControl); -#else mouseEvent->GetCtrlKey(&isControl); -#endif mouseEvent->GetShiftKey(&isShift); return PerformSelection(aClickedIndex, isShift, isControl); // might destroy us } @@ -1930,11 +1926,7 @@ nsListControlFrame::DragMove(nsIDOMEvent* aMouseEvent) nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aMouseEvent); NS_ASSERTION(mouseEvent, "aMouseEvent is not an nsIDOMMouseEvent!"); bool isControl; -#ifdef XP_MACOSX - mouseEvent->GetMetaKey(&isControl); -#else mouseEvent->GetCtrlKey(&isControl); -#endif nsWeakFrame weakFrame(this); // Turn SHIFT on when you are dragging, unless control is on. bool wasChanged = PerformSelection(selectedIndex, @@ -2142,14 +2134,8 @@ nsListControlFrame::KeyDown(nsIDOMEvent* aKeyEvent) bool dropDownMenuOnUpDown; bool dropDownMenuOnSpace; -#ifdef XP_MACOSX - dropDownMenuOnUpDown = IsInDropDownMode() && !mComboboxFrame->IsDroppedDown(); - dropDownMenuOnSpace = !keyEvent->IsAlt() && !keyEvent->IsControl() && - !keyEvent->IsMeta(); -#else dropDownMenuOnUpDown = keyEvent->IsAlt(); dropDownMenuOnSpace = IsInDropDownMode() && !mComboboxFrame->IsDroppedDown(); -#endif bool withinIncrementalSearchTime = keyEvent->mTime - gLastKeyTime <= INCREMENTAL_SEARCH_KEYPRESS_TIME; if ((dropDownMenuOnUpDown && |