From 2dee462ae395dcae94e6eb26eea276d4b697b34e Mon Sep 17 00:00:00 2001 From: "mjudge%netscape.com" Date: Fri, 29 Oct 1999 23:07:07 +0000 Subject: [PATCH] i cannot find the bug# it is for selecting inside forms. we need to turn off selection in certain frames based on the style. this sets up it to work once we figure out the style rule to set. git-svn-id: svn://10.0.0.236/trunk@52288 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrame.cpp | 10 +++++++++- mozilla/layout/html/base/src/nsFrame.cpp | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index fd488419012..ea3f45c18c5 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -587,7 +587,15 @@ nsFrame::DisplaySelection(nsIPresContext& aPresContext, PRBool isOkToTurnOn) } } } - + if (result) + { + // Prepare the block reflow engine + const nsStyleUserInterface* userinterface; + GetStyleData(eStyleStruct_UserInterface, + (const nsStyleStruct*&) userinterface); + if (userinterface) + result = userinterface->mUserSelect; + } return result; } diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index fd488419012..ea3f45c18c5 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -587,7 +587,15 @@ nsFrame::DisplaySelection(nsIPresContext& aPresContext, PRBool isOkToTurnOn) } } } - + if (result) + { + // Prepare the block reflow engine + const nsStyleUserInterface* userinterface; + GetStyleData(eStyleStruct_UserInterface, + (const nsStyleStruct*&) userinterface); + if (userinterface) + result = userinterface->mUserSelect; + } return result; }