зеркало из https://github.com/mozilla/pjs.git
Bug 93467 - removing remaining references to native combobox and nsIComboBox interface. r=pavlov, sr=blizzard.
This commit is contained in:
Родитель
691293abed
Коммит
c2f7822cfa
|
@ -8,10 +8,8 @@ nsIKBStateControl.h
|
|||
nsIButton.h
|
||||
nsICheckButton.h
|
||||
nsIListWidget.h
|
||||
nsIComboBox.h
|
||||
nsITextWidget.h
|
||||
nsITextAreaWidget.h
|
||||
nsIComboBox.h
|
||||
nsIListBox.h
|
||||
nsIScrollbar.h
|
||||
nsGUIEvent.h
|
||||
|
|
|
@ -44,10 +44,8 @@ EXPORTS = \
|
|||
nsIButton.h \
|
||||
nsICheckButton.h \
|
||||
nsIListWidget.h \
|
||||
nsIComboBox.h \
|
||||
nsITextWidget.h \
|
||||
nsITextAreaWidget.h \
|
||||
nsIComboBox.h \
|
||||
nsIListBox.h \
|
||||
nsIScrollbar.h \
|
||||
nsGUIEvent.h \
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "nsIFileWidget.h"
|
||||
#include "nsIAppShell.h"
|
||||
#include "nsIButton.h"
|
||||
#include "nsIComboBox.h"
|
||||
#include "nsIEventListener.h"
|
||||
#include "nsILabel.h"
|
||||
#include "nsIListBox.h"
|
||||
|
@ -275,37 +274,6 @@ NS_CreateListBox(nsISupports* aParent,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_WIDGET nsresult
|
||||
NS_CreateComboBox(nsISupports* aParent,
|
||||
nsIComboBox* aWidget,
|
||||
const nsRect& aRect,
|
||||
EVENT_CALLBACK aHandleEventFunction,
|
||||
const nsFont* aFont)
|
||||
{
|
||||
nsIWidget* parent = nsnull;
|
||||
if (aParent != nsnull)
|
||||
aParent->QueryInterface(kIWidgetIID,(void**)&parent);
|
||||
|
||||
nsIWidget* widget = nsnull;
|
||||
if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) {
|
||||
widget->Create(parent, aRect, aHandleEventFunction, NULL);
|
||||
widget->Show(PR_TRUE);
|
||||
if (aFont != nsnull)
|
||||
widget->SetFont(*aFont);
|
||||
NS_IF_RELEASE(widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object");
|
||||
}
|
||||
|
||||
if (aParent)
|
||||
NS_IF_RELEASE(parent);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
extern NS_WIDGET nsresult
|
||||
NS_ShowWidget(nsISupports* aWidget, PRBool aShow)
|
||||
{
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "nsIFileWidget.h"
|
||||
#include "nsIAppShell.h"
|
||||
#include "nsIButton.h"
|
||||
#include "nsIComboBox.h"
|
||||
#include "nsIEventListener.h"
|
||||
#include "nsILabel.h"
|
||||
#include "nsIListBox.h"
|
||||
|
@ -265,37 +264,6 @@ NS_CreateListBox(nsISupports* aParent,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_WIDGET nsresult
|
||||
NS_CreateComboBox(nsISupports* aParent,
|
||||
nsIComboBox* aWidget,
|
||||
const nsRect& aRect,
|
||||
EVENT_CALLBACK aHandleEventFunction,
|
||||
const nsFont* aFont)
|
||||
{
|
||||
nsIWidget* parent = nsnull;
|
||||
if (aParent != nsnull)
|
||||
aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent);
|
||||
|
||||
nsIWidget* widget = nsnull;
|
||||
if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) {
|
||||
widget->Create(parent, aRect, aHandleEventFunction, NULL);
|
||||
widget->Show(PR_TRUE);
|
||||
if (aFont != nsnull)
|
||||
widget->SetFont(*aFont);
|
||||
NS_IF_RELEASE(widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
NS_ERROR("Called QueryInterface on a non nsIWidget supported object");
|
||||
}
|
||||
|
||||
if (aParent)
|
||||
NS_IF_RELEASE(parent);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
extern NS_WIDGET nsresult
|
||||
NS_ShowWidget(nsISupports* aWidget, PRBool aShow)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче