зеркало из https://github.com/mozilla/gecko-dev.git
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.
This commit is contained in:
Родитель
310d461115
Коммит
acd040bfa4
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче