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/generic/nsFrame.cpp | |
| parent | 1bf0734a7249eb0dc1a96d825e7310eb46cac6dc (diff) | |
| download | uxp-aa0fd3d68c856504646e1d7eb499bc890ef44101.tar.gz | |
Issue #1751 -- Remove XP_MACOSX conditionals from /layout
Diffstat (limited to 'layout/generic/nsFrame.cpp')
| -rw-r--r-- | layout/generic/nsFrame.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 5d05b71037..b8e66ecbcd 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -1,5 +1,4 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -// vim:cindent:ts=2:et:sw=2: /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -3056,11 +3055,7 @@ nsFrame::GetDataForTableSelection(const nsFrameSelection* aFrameSelection, { // In Browser, special 'table selection' key must be pressed for table selection // or when just Shift is pressed and we're already in table/cell selection mode -#ifdef XP_MACOSX - doTableSelection = aMouseEvent->IsMeta() || (aMouseEvent->IsShift() && selectingTableCells); -#else doTableSelection = aMouseEvent->IsControl() || (aMouseEvent->IsShift() && selectingTableCells); -#endif } if (!doTableSelection) return NS_OK; @@ -3329,13 +3324,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext, if (!frameselection || frameselection->GetDisplaySelection() == nsISelectionController::SELECTION_OFF) return NS_OK;//nothing to do we cannot affect selection from here -#ifdef XP_MACOSX - if (mouseEvent->IsControl()) - return NS_OK;//short circuit. hard coded for mac due to time restraints. - bool control = mouseEvent->IsMeta(); -#else bool control = mouseEvent->IsControl(); -#endif RefPtr<nsFrameSelection> fc = const_cast<nsFrameSelection*>(frameselection); if (mouseEvent->mClickCount > 1) { |