From 6537159c2b4f71f1de2503b0d54485aa9925ffbb Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Fri, 6 Aug 1999 07:14:43 +0000 Subject: [PATCH] Fix gcc 2.7 bustage. It smells a lot like a bug in gcc. It was having trouble dealing with the Inherited typedef in the class declaration. I replaced |Inherited| with the real thing Inherited was aliasing and all is ok. Pierre code reviewed. git-svn-id: svn://10.0.0.236/trunk@42413 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsGfxRadioControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp index e6436f38b90..4a0ccd007b3 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp @@ -86,7 +86,7 @@ nsGfxRadioControlFrame::ReResolveStyleContext(nsIPresContext* aPresContext, &mRadioButtonFaceStyle); if ((mRadioButtonFaceStyle && oldRadioButtonFaceStyle.get()) && (mRadioButtonFaceStyle != oldRadioButtonFaceStyle.get())) { - Inherited::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, + nsRadioControlFrame::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, aParentChange, aChangeList, aLocalChange); } diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp index e6436f38b90..4a0ccd007b3 100644 --- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp @@ -86,7 +86,7 @@ nsGfxRadioControlFrame::ReResolveStyleContext(nsIPresContext* aPresContext, &mRadioButtonFaceStyle); if ((mRadioButtonFaceStyle && oldRadioButtonFaceStyle.get()) && (mRadioButtonFaceStyle != oldRadioButtonFaceStyle.get())) { - Inherited::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, + nsRadioControlFrame::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, aParentChange, aChangeList, aLocalChange); } diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp index 291213013e1..482a5797958 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -429,7 +429,7 @@ nsGfxTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = Inherited::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = nsFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); } // DUMMY diff --git a/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp index 0f910939b6d..978b544aa65 100644 --- a/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp @@ -77,7 +77,7 @@ nsNativeFormControlFrame::Reflow(nsIPresContext& aPresContext, } if (! requiresWidget) { - return Inherited::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); + return nsFormControlFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); } // add ourself as an nsIFormControlFrame