diff --git a/content/base/public/nsISelectionController.idl b/content/base/public/nsISelectionController.idl index 0d02393dcf0..05d0ea2acc6 100644 --- a/content/base/public/nsISelectionController.idl +++ b/content/base/public/nsISelectionController.idl @@ -66,6 +66,18 @@ interface nsISelectionController : nsISupports */ short getDisplaySelection(); + /** + * SetDisplayNonTextSelection used to set whether you want to see HRULES/IMAGES with border. + * also used to tell if the presshell is an editor right now. this should change + */ + void setDisplayNonTextSelection(in boolean toggle); + + /** + * GetDisplayNonTextSelection used to get whether you want to see HRULES/IMAGES with border. + * also used to tell if the presshell is an editor right now. this should change + */ + boolean getDisplayNonTextSelection(); + /** * GetSelection will return the selection that the presentation * shell may implement. diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h index 9be216b743d..41945aa5d7d 100644 --- a/layout/base/nsIPresShell.h +++ b/layout/base/nsIPresShell.h @@ -16,7 +16,7 @@ * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. - * + * * Contributor(s): * Steve Clark (buster@netscape.com) * diff --git a/layout/base/public/nsIPresShell.h b/layout/base/public/nsIPresShell.h index 9be216b743d..41945aa5d7d 100644 --- a/layout/base/public/nsIPresShell.h +++ b/layout/base/public/nsIPresShell.h @@ -16,7 +16,7 @@ * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. - * + * * Contributor(s): * Steve Clark (buster@netscape.com) * diff --git a/layout/base/public/nsISelectionController.idl b/layout/base/public/nsISelectionController.idl index 0d02393dcf0..05d0ea2acc6 100644 --- a/layout/base/public/nsISelectionController.idl +++ b/layout/base/public/nsISelectionController.idl @@ -66,6 +66,18 @@ interface nsISelectionController : nsISupports */ short getDisplaySelection(); + /** + * SetDisplayNonTextSelection used to set whether you want to see HRULES/IMAGES with border. + * also used to tell if the presshell is an editor right now. this should change + */ + void setDisplayNonTextSelection(in boolean toggle); + + /** + * GetDisplayNonTextSelection used to get whether you want to see HRULES/IMAGES with border. + * also used to tell if the presshell is an editor right now. this should change + */ + boolean getDisplayNonTextSelection(); + /** * GetSelection will return the selection that the presentation * shell may implement. diff --git a/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/layout/html/forms/src/nsGfxTextControlFrame2.cpp index fb2d3506c6e..71abaf46205 100644 --- a/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -267,6 +267,8 @@ public: //NSISELECTIONCONTROLLER INTERFACES NS_IMETHOD SetDisplaySelection(PRInt16 toggle); NS_IMETHOD GetDisplaySelection(PRInt16 *_retval); + NS_IMETHOD SetDisplayNonTextSelection(PRBool toggle); + NS_IMETHOD GetDisplayNonTextSelection(PRBool *_retval); NS_IMETHOD GetSelection(PRInt16 type, nsIDOMSelection **_retval); NS_IMETHOD ScrollSelectionIntoView(PRInt16 type, PRInt16 region); NS_IMETHOD RepaintSelection(PRInt16 type); @@ -355,6 +357,18 @@ nsTextInputSelectionImpl::GetDisplaySelection(PRInt16 *aToggle) return NS_ERROR_NULL_POINTER; } +NS_IMETHODIMP +nsTextInputSelectionImpl::SetDisplayNonTextSelection(PRBool aToggle) +{ + return NS_OK;//stub this out. not used in input +} + +NS_IMETHODIMP +nsTextInputSelectionImpl::GetDisplayNonTextSelection(PRBool *aToggle) +{ + return NS_OK;//stub this out. not used in input +} + NS_IMETHODIMP nsTextInputSelectionImpl::GetSelection(PRInt16 type, nsIDOMSelection **_retval) { @@ -915,6 +929,7 @@ nsGfxTextControlFrame2::ReflowStandard(nsIPresContext* aPresContext, } + PRInt32 nsGfxTextControlFrame2::CalculateSizeStandard (nsIPresContext* aPresContext, nsIRenderingContext* aRendContext, @@ -1413,6 +1428,8 @@ nsGfxTextControlFrame2::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) return NS_OK; } + + NS_IMETHODIMP nsGfxTextControlFrame2::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) {