Backing out changes for bug 326944, really this time\!

layout/forms/nsComboboxControlFrame.cpp

@@ -362,9 +362,9 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   if (NULL == aInstancePtr) {
     return NS_ERROR_NULL_POINTER;
   }
-  
-  if (aIID.Equals(GetCID())) {
-    *aInstancePtr = this;
+
+  if (aIID.Equals(NS_GET_IID(nsIComboboxControlFrame))) {
+    *aInstancePtr = (void*)(nsIComboboxControlFrame*)this;
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
     *aInstancePtr = (void*)(nsIFormControlFrame*)this;
@@ -1551,6 +1551,12 @@ nsComboboxControlFrame::SetDropDown(nsIFrame* aDropDownFrame)
   CallQueryInterface(mDropdownFrame, &mListControlFrame);
 }
 
+nsIFrame*
+nsComboboxControlFrame::GetDropDown() 
+{
+  return mDropdownFrame;
+}
+
 // Toggle dropdown list.
 
 NS_IMETHODIMP