From cee3171b28ba77a3ee9d17fce22bdbf02aa5ff5f Mon Sep 17 00:00:00 2001 From: "kmcclusk%netscape.com" Date: Mon, 25 Oct 1999 22:06:41 +0000 Subject: [PATCH] Removed build warning caused by overloaded GetDesiredSize. bug=15575. r=buster@netscape.com git-svn-id: svn://10.0.0.236/trunk@51745 18797224-902f-48f8-a5cc-f745e15eee43 --- .../layout/html/forms/src/nsButtonControlFrame.cpp | 11 +++++++++++ mozilla/layout/html/forms/src/nsButtonControlFrame.h | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp index a71a4618fb1..67f18f36e9d 100644 --- a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp @@ -214,6 +214,17 @@ nsButtonControlFrame::MouseClicked(nsIPresContext* aPresContext) } } +void +nsButtonControlFrame::GetDesiredSize(nsIPresContext* aPresContext, + const nsHTMLReflowState& aReflowState, + nsHTMLReflowMetrics& aDesiredSize) +{ + // This "do-nothing" implementation exists to remove compiler warnings caused + // by the fact that GetDesiredSize is both overloaded and overridden. + Inherited::GetDesiredSize(aPresContext, aReflowState, aDesiredSize); +} + + void nsButtonControlFrame::GetDesiredSize(nsIPresContext* aPresContext, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.h b/mozilla/layout/html/forms/src/nsButtonControlFrame.h index 06852af2a40..feaf8189110 100644 --- a/mozilla/layout/html/forms/src/nsButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.h @@ -70,6 +70,10 @@ protected: nsHTMLReflowMetrics& aDesiredLayoutSize, nsSize& aDesiredWidgetSize); + virtual void GetDesiredSize(nsIPresContext* aPresContext, + const nsHTMLReflowState& aReflowState, + nsHTMLReflowMetrics& aDesiredSize); + virtual void Redraw();