diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index a5c2c357193..76849fe393b 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -268,18 +268,6 @@ nsComboboxControlFrame::~nsComboboxControlFrame() NS_IF_RELEASE(mPresContext); } -NS_IMETHODIMP -nsComboboxControlFrame::Destroy(nsIPresContext* aPresContext) -{ - nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); - if (mFormFrame) { - mFormFrame->RemoveFormControlFrame(*this); - mFormFrame = nsnull; - } - return nsHTMLContainerFrame::Destroy(aPresContext); -} - - //-------------------------------------------------------------- // Frames are not refcounted, no need to AddRef NS_IMETHODIMP diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index a5c2c357193..76849fe393b 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -268,18 +268,6 @@ nsComboboxControlFrame::~nsComboboxControlFrame() NS_IF_RELEASE(mPresContext); } -NS_IMETHODIMP -nsComboboxControlFrame::Destroy(nsIPresContext* aPresContext) -{ - nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); - if (mFormFrame) { - mFormFrame->RemoveFormControlFrame(*this); - mFormFrame = nsnull; - } - return nsHTMLContainerFrame::Destroy(aPresContext); -} - - //-------------------------------------------------------------- // Frames are not refcounted, no need to AddRef NS_IMETHODIMP