From a7cee2ccb1adee298656d843714bfab4a71c5fd7 Mon Sep 17 00:00:00 2001 From: "pierre%netscape.com" Date: Wed, 20 Oct 1999 23:30:29 +0000 Subject: [PATCH] #15636 "Cleanup build warnings". Some compilers issued a "hidden virtual method" warning because only one of the two implementations of GetDesiredSize() was overridden. r=slamm. git-svn-id: svn://10.0.0.236/trunk@51314 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h | 5 +++++ mozilla/layout/html/forms/src/nsNativeRadioControlFrame.h | 5 +++++ mozilla/layout/html/forms/src/nsNativeSelectControlFrame.cpp | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h b/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h index 68a7f400094..9f56b1cda46 100644 --- a/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h +++ b/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h @@ -45,6 +45,11 @@ protected: const nsHTMLReflowState& aReflowState, nsHTMLReflowMetrics& aDesiredLayoutSize, nsSize& aDesiredWidgetSize); + + virtual void GetDesiredSize(nsIPresContext* aPresContext, + const nsHTMLReflowState& aReflowState, + nsHTMLReflowMetrics& aDesiredSize) + { nsFormControlFrame::GetDesiredSize(aPresContext, aReflowState, aDesiredSize); } }; #endif diff --git a/mozilla/layout/html/forms/src/nsNativeRadioControlFrame.h b/mozilla/layout/html/forms/src/nsNativeRadioControlFrame.h index 96fa55cdf75..ed3d3fd50a7 100644 --- a/mozilla/layout/html/forms/src/nsNativeRadioControlFrame.h +++ b/mozilla/layout/html/forms/src/nsNativeRadioControlFrame.h @@ -56,6 +56,11 @@ protected: nsHTMLReflowMetrics& aDesiredLayoutSize, nsSize& aDesiredWidgetSize); + virtual void GetDesiredSize(nsIPresContext* aPresContext, + const nsHTMLReflowState& aReflowState, + nsHTMLReflowMetrics& aDesiredSize) + { nsFormControlFrame::GetDesiredSize(aPresContext, aReflowState, aDesiredSize); } + private: NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; } NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; } diff --git a/mozilla/layout/html/forms/src/nsNativeSelectControlFrame.cpp b/mozilla/layout/html/forms/src/nsNativeSelectControlFrame.cpp index 8b01a67da54..be4f8019a0e 100644 --- a/mozilla/layout/html/forms/src/nsNativeSelectControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsNativeSelectControlFrame.cpp @@ -172,6 +172,11 @@ protected: const nsHTMLReflowState& aReflowState, nsHTMLReflowMetrics& aDesiredLayoutSize, nsSize& aDesiredWidgetSize); + + virtual void GetDesiredSize(nsIPresContext* aPresContext, + const nsHTMLReflowState& aReflowState, + nsHTMLReflowMetrics& aDesiredSize) + { nsFormControlFrame::GetDesiredSize(aPresContext, aReflowState, aDesiredSize); } void GetWidgetSize(nsIPresContext& aPresContext, nscoord& aWidth, nscoord& aHeight);