From 2d1e8c9de211e94de0015cda6a07e3fef134c605 Mon Sep 17 00:00:00 2001 From: "rods@netscape.com" Date: Tue, 25 Jan 2000 15:24:48 +0000 Subject: [PATCH] changed signature of GetFont,changed to scroll it into view only if it isn't visible b=905,18649 r=dcone,troy --- layout/forms/nsFileControlFrame.cpp | 9 ++++----- layout/html/forms/src/nsFileControlFrame.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index 68af30675005..3bf49fa1a111 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -222,7 +222,7 @@ nsFileControlFrame::ScrollIntoView(nsIPresContext* aPresContext) nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); presShell->ScrollFrameIntoView(this, - NS_PRESSHELL_SCROLL_ANYWHERE,NS_PRESSHELL_SCROLL_ANYWHERE); + NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE); } } @@ -467,11 +467,10 @@ nsFileControlFrame::GetFormContent(nsIContent*& aContent) const } NS_IMETHODIMP -nsFileControlFrame::GetFont(nsIPresContext* aPresContext, - nsFont& aFont) +nsFileControlFrame::GetFont(nsIPresContext* aPresContext, + const nsFont*& aFont) { - nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); - return NS_OK; + return nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); } nscoord nsFileControlFrame::GetVerticalInsidePadding(nsIPresContext* aPresContext, diff --git a/layout/html/forms/src/nsFileControlFrame.cpp b/layout/html/forms/src/nsFileControlFrame.cpp index 68af30675005..3bf49fa1a111 100644 --- a/layout/html/forms/src/nsFileControlFrame.cpp +++ b/layout/html/forms/src/nsFileControlFrame.cpp @@ -222,7 +222,7 @@ nsFileControlFrame::ScrollIntoView(nsIPresContext* aPresContext) nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); presShell->ScrollFrameIntoView(this, - NS_PRESSHELL_SCROLL_ANYWHERE,NS_PRESSHELL_SCROLL_ANYWHERE); + NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE); } } @@ -467,11 +467,10 @@ nsFileControlFrame::GetFormContent(nsIContent*& aContent) const } NS_IMETHODIMP -nsFileControlFrame::GetFont(nsIPresContext* aPresContext, - nsFont& aFont) +nsFileControlFrame::GetFont(nsIPresContext* aPresContext, + const nsFont*& aFont) { - nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); - return NS_OK; + return nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); } nscoord nsFileControlFrame::GetVerticalInsidePadding(nsIPresContext* aPresContext,