From bca958996895b07ee219289c4c0faafb3a30293a Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Mon, 31 Jan 2000 23:43:56 +0000 Subject: [PATCH] removed errant |QueryInterface()|s in favor of appropriate macros, as part of bug#23737. Changed |NS_DEFINE_IID| to |NS_DEFINE_CID| where appropriate; or else removed it, and fixed up clients to use |NS_GET_IID| in the appropriate spots. Built and ran pre-checkin tests. r=pavlov ... who claims this shouldn't effect other platforms; but I'm watching anyway --- widget/public/nsIMenuListener.h | 2 - widget/src/mac/nsAppShell.cpp | 3 +- widget/src/mac/nsButton.cpp | 18 +--- widget/src/mac/nsCheckButton.cpp | 17 +--- widget/src/mac/nsComboBox.cpp | 26 +----- widget/src/mac/nsContextMenu.cpp | 70 ++++---------- widget/src/mac/nsFileWidget.cpp | 24 +---- widget/src/mac/nsLabel.cpp | 18 +--- widget/src/mac/nsListBox.cpp | 26 +----- widget/src/mac/nsLookAndFeel.cpp | 4 +- widget/src/mac/nsMacMessagePump.cpp | 3 +- widget/src/mac/nsMacWindow.cpp | 2 +- widget/src/mac/nsMenu.cpp | 91 +++++-------------- widget/src/mac/nsMenuBar.cpp | 55 +++-------- widget/src/mac/nsMenuItem.cpp | 41 +-------- widget/src/mac/nsRadioButton.cpp | 18 +--- widget/src/mac/nsScrollbar.cpp | 25 +---- widget/src/mac/nsTextAreaWidget.cpp | 22 +---- widget/src/mac/nsTextWidget.cpp | 17 +--- widget/src/mac/nsToolkit.cpp | 12 +-- widget/src/mac/nsWidgetFactory.cpp | 84 ++++++----------- widget/src/mac/nsWidgetSupport.cpp | 68 ++++++-------- widget/src/mac/nsWindow.cpp | 16 +--- widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp | 30 +----- widget/src/xpwidgets/nsXIFFormatConverter.cpp | 2 +- 25 files changed, 161 insertions(+), 533 deletions(-) diff --git a/widget/public/nsIMenuListener.h b/widget/public/nsIMenuListener.h index a568bd3ca2d6..8d8a40b05920 100644 --- a/widget/public/nsIMenuListener.h +++ b/widget/public/nsIMenuListener.h @@ -31,8 +31,6 @@ #define NS_IMENULISTENER_IID \ { 0xbc658c81, 0x4beb, 0x11d2, \ { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x9e } } - -static NS_DEFINE_IID(kIMenuListenerIID, NS_IMENULISTENER_IID); /** * diff --git a/widget/src/mac/nsAppShell.cpp b/widget/src/mac/nsAppShell.cpp index 5029dca2ed18..e314d1184e90 100644 --- a/widget/src/mac/nsAppShell.cpp +++ b/widget/src/mac/nsAppShell.cpp @@ -58,10 +58,9 @@ PRBool nsAppShell::mInitializedToolbox = PR_FALSE; // nsISupports implementation macro // //------------------------------------------------------------------------- -NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID); NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -NS_IMPL_ISUPPORTS(nsAppShell,kIAppShellIID); +NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell) NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener) { diff --git a/widget/src/mac/nsButton.cpp b/widget/src/mac/nsButton.cpp index 752ed7f1b317..938dce4076a8 100644 --- a/widget/src/mac/nsButton.cpp +++ b/widget/src/mac/nsButton.cpp @@ -51,21 +51,9 @@ nsButton::~nsButton() // // //------------------------------------------------------------------------- -nsresult nsButton::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kIButton, NS_IBUTTON_IID); - if (aIID.Equals(kIButton)) { - *aInstancePtr = (void*) ((nsIButton*)this); - AddRef(); - return NS_OK; - } - - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsButton) + NS_INTERFACE_MAP_ENTRY(nsIButton) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) #pragma mark - //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsCheckButton.cpp b/widget/src/mac/nsCheckButton.cpp index 1d05fc412de3..7974edab68aa 100644 --- a/widget/src/mac/nsCheckButton.cpp +++ b/widget/src/mac/nsCheckButton.cpp @@ -51,20 +51,9 @@ nsCheckButton::~nsCheckButton() // // //------------------------------------------------------------------------- -nsresult nsCheckButton::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); - if (aIID.Equals(kICheckButtonIID)) { - *aInstancePtr = (void*) ((nsICheckButton*)this); - AddRef(); - return NS_OK; - } - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsCheckButton) + NS_INTERFACE_MAP_ENTRY(nsICheckButton) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) #pragma mark - //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsComboBox.cpp b/widget/src/mac/nsComboBox.cpp index 7bff6d995a1a..1db49faf1fce 100644 --- a/widget/src/mac/nsComboBox.cpp +++ b/widget/src/mac/nsComboBox.cpp @@ -107,28 +107,10 @@ NS_IMETHODIMP nsComboBox::Create(nsIWidget *aParent, // // //------------------------------------------------------------------------- -nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kInsComboBoxIID, NS_ICOMBOBOX_IID); - static NS_DEFINE_IID(kInsListWidgetIID, NS_ILISTWIDGET_IID); - - if (aIID.Equals(kInsComboBoxIID)) { - *aInstancePtr = (void*) ((nsIComboBox*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - else if (aIID.Equals(kInsListWidgetIID)) { - *aInstancePtr = (void*) ((nsIListWidget*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsComboBox) + NS_INTERFACE_MAP_ENTRY(nsIComboBox) + NS_INTERFACE_MAP_ENTRY(nsIListWidget) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) #pragma mark - //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsContextMenu.cpp b/widget/src/mac/nsContextMenu.cpp index 8f4a42a5f7b2..5f395df31522 100644 --- a/widget/src/mac/nsContextMenu.cpp +++ b/widget/src/mac/nsContextMenu.cpp @@ -40,45 +40,13 @@ #include #include -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIContextMenuIID, NS_ICONTEXTMENU_IID); -static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID); -static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID); - // CIDs #include "nsWidgetsCID.h" -static NS_DEFINE_IID(kMenuBarCID, NS_MENUBAR_CID); -static NS_DEFINE_IID(kMenuCID, NS_MENU_CID); -static NS_DEFINE_IID(kMenuItemCID, NS_MENUITEM_CID); +static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); +static NS_DEFINE_CID(kMenuCID, NS_MENU_CID); +static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID); -nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - if (aIID.Equals(kIContextMenuIID)) { - *aInstancePtr = (void*)(nsIContextMenu*) this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIMenuListenerIID)) { - *aInstancePtr = (void*) ((nsIMenuListener*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - -NS_IMPL_ADDREF(nsContextMenu) -NS_IMPL_RELEASE(nsContextMenu) +NS_IMPL_ISUPPORTS2(nsContextMenu, nsIContextMenu, nsIMenuListener) //------------------------------------------------------------------------- // @@ -125,7 +93,7 @@ nsContextMenu::~nsContextMenu() if(mMenuItemVoidArray[mNumMenuItems]) { // Figure out what we're releasing nsIMenuItem * menuitem = nsnull; - ((nsISupports*)mMenuItemVoidArray[mNumMenuItems])->QueryInterface(kIMenuItemIID, (void**) &menuitem); + ((nsISupports*)mMenuItemVoidArray[mNumMenuItems])->QueryInterface(NS_GET_IID(nsIMenuItem), (void**) &menuitem); if(menuitem) { // case menuitem @@ -135,7 +103,7 @@ nsContextMenu::~nsContextMenu() else { nsIMenu * menu = nsnull; - ((nsISupports*)mMenuItemVoidArray[mNumMenuItems])->QueryInterface(kIMenuIID, (void**) &menu); + ((nsISupports*)mMenuItemVoidArray[mNumMenuItems])->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu); if(menu) { // case menu @@ -171,7 +139,7 @@ NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent) { aParent = nsnull; if (mParent) { - return mParent->QueryInterface(kISupportsIID,(void**)&aParent); + return mParent->QueryInterface(NS_GET_IID(nsISupports),(void**)&aParent); } return NS_ERROR_FAILURE; } @@ -183,7 +151,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports* aItem) { // Figure out what we're adding nsIMenuItem * menuitem = nsnull; - aItem->QueryInterface(kIMenuItemIID, (void**) &menuitem); + aItem->QueryInterface(NS_GET_IID(nsIMenuItem), (void**) &menuitem); if(menuitem) { // case menuitem @@ -193,7 +161,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports* aItem) else { nsIMenu * menu = nsnull; - aItem->QueryInterface(kIMenuIID, (void**) &menu); + aItem->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu); if(menu) { // case menu @@ -210,7 +178,7 @@ NS_METHOD nsContextMenu::AddMenuItem(nsIMenuItem * aMenuItem) { if(aMenuItem) { nsISupports * supports = nsnull; - aMenuItem->QueryInterface(kISupportsIID, (void**)&supports); + aMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**)&supports); if(supports) { mMenuItemVoidArray.AppendElement(supports); @@ -242,7 +210,7 @@ NS_METHOD nsContextMenu::AddMenu(nsIMenu * aMenu) // Add a submenu if(aMenu) { nsISupports * supports = nsnull; - aMenu->QueryInterface(kISupportsIID, (void**)&supports); + aMenu->QueryInterface(NS_GET_IID(nsISupports), (void**)&supports); if(supports) { mMenuItemVoidArray.AppendElement(supports); @@ -364,7 +332,7 @@ nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent) //PRInt16 menuItemID = LoWord(((nsMenuEvent)aMenuEvent).mCommand); PRInt16 menuItemID = mSelectedMenuItem; nsIMenuListener * menuListener = nsnull; - ((nsIMenuItem*)mMenuItemVoidArray[menuItemID-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsIMenuItem*)mMenuItemVoidArray[menuItemID-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if(menuListener) { eventStatus = menuListener->MenuSelected(aMenuEvent); NS_IF_RELEASE(menuListener); @@ -378,11 +346,11 @@ nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent) if(nsnull != mMenuItemVoidArray[i-1]) { nsIMenu * submenu = nsnull; - ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(kIMenuIID, &submenu); + ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu), &submenu); if(submenu) { nsIMenuListener * menuListener = nsnull; - ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if(menuListener){ eventStatus = menuListener->MenuSelected(aMenuEvent); NS_IF_RELEASE(menuListener); @@ -564,12 +532,12 @@ void nsContextMenu::LoadMenuItem( menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd); // Create nsMenuItem nsIMenuItem * pnsMenuItem = nsnull; - nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem); + nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem); if (NS_OK == rv) { pnsMenuItem->Create(pParentMenu, menuitemName, 0); nsISupports * supports = nsnull; - pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports); + pnsMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pParentMenu->AddItem(supports); // Parent should now own menu item NS_RELEASE(supports); @@ -616,11 +584,11 @@ void nsContextMenu::LoadSubMenu( // Create nsMenu nsIMenu * pnsMenu = nsnull; - nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu); + nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu); if (NS_OK == rv) { // Call Create nsISupports * supports = nsnull; - pParentMenu->QueryInterface(kISupportsIID, (void**) &supports); + pParentMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pnsMenu->Create(supports, menuName); NS_RELEASE(supports); // Balance QI @@ -629,7 +597,7 @@ void nsContextMenu::LoadSubMenu( // Make nsMenu a child of parent nsMenu. The parent takes ownership supports = nsnull; - pnsMenu->QueryInterface(kISupportsIID, (void**) &supports); + pnsMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pParentMenu->AddItem(supports); NS_RELEASE(supports); diff --git a/widget/src/mac/nsFileWidget.cpp b/widget/src/mac/nsFileWidget.cpp index 1f4ee3c6a982..24a945b1660e 100644 --- a/widget/src/mac/nsFileWidget.cpp +++ b/widget/src/mac/nsFileWidget.cpp @@ -108,27 +108,9 @@ NS_IMETHODIMP nsFileWidget:: Create(nsIWidget *aParent, } -/** - * Implement the standard QueryInterface for NS_IWIDGET_IID and NS_ISUPPORTS_IID - * @param aIID The name of the class implementing the method - * @param _classiiddef The name of the #define symbol that defines the IID - * for the class (e.g. NS_ISUPPORTS_IID) -*/ -nsresult nsFileWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kIFileWidgetIID, NS_IFILEWIDGET_IID); - if (aIID.Equals(kIFileWidgetIID)) { - *aInstancePtr = (void*) ((nsIFileWidget*)this); - AddRef(); - return NS_OK; - } - - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsFileWidget) + NS_INTERFACE_MAP_ENTRY(nsIFileWidget) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) diff --git a/widget/src/mac/nsLabel.cpp b/widget/src/mac/nsLabel.cpp index a9de67eebcdb..bca8cc1b70a9 100644 --- a/widget/src/mac/nsLabel.cpp +++ b/widget/src/mac/nsLabel.cpp @@ -47,21 +47,9 @@ nsLabel::~nsLabel() // // //------------------------------------------------------------------------- -nsresult nsLabel::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kILabel, NS_ILABEL_IID); - if (aIID.Equals(kILabel)) { - *aInstancePtr = (void*) ((nsILabel*)this); - AddRef(); - return NS_OK; - } - - return nsTextWidget::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsLabel) + NS_INTERFACE_MAP_ENTRY(nsILabel) +NS_INTERFACE_MAP_END_INHERITING(nsTextWidget) #pragma mark - //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsListBox.cpp b/widget/src/mac/nsListBox.cpp index ece1d586aef9..8af061c8a14c 100644 --- a/widget/src/mac/nsListBox.cpp +++ b/widget/src/mac/nsListBox.cpp @@ -135,28 +135,10 @@ NS_IMETHODIMP nsListBox::Create(nsIWidget *aParent, // // //------------------------------------------------------------------------- -nsresult nsListBox::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kInsListBoxIID, NS_ILISTBOX_IID); - static NS_DEFINE_IID(kInsListWidgetIID, NS_ILISTWIDGET_IID); - - if (aIID.Equals(kInsListBoxIID)) { - *aInstancePtr = (void*) ((nsIListBox*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - else if (aIID.Equals(kInsListWidgetIID)) { - *aInstancePtr = (void*) ((nsIListWidget*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsListBox) + NS_INTERFACE_MAP_ENTRY(nsIListBox) + NS_INTERFACE_MAP_ENTRY(nsIListWidget) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) //------------------------------------------------------------------------- // diff --git a/widget/src/mac/nsLookAndFeel.cpp b/widget/src/mac/nsLookAndFeel.cpp index c01ca44d4512..44824c2015bf 100644 --- a/widget/src/mac/nsLookAndFeel.cpp +++ b/widget/src/mac/nsLookAndFeel.cpp @@ -24,15 +24,13 @@ #include "nsCarbonHelpers.h" -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); - //------------------------------------------------------------------------- // // Query interface implementation // //------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS(nsLookAndFeel, kILookAndFeelIID); +NS_IMPL_ISUPPORTS1(nsLookAndFeel, nsILookAndFeel); nsLookAndFeel::nsLookAndFeel() { diff --git a/widget/src/mac/nsMacMessagePump.cpp b/widget/src/mac/nsMacMessagePump.cpp index bdcdb7f99ee4..47b059eb143f 100644 --- a/widget/src/mac/nsMacMessagePump.cpp +++ b/widget/src/mac/nsMacMessagePump.cpp @@ -156,8 +156,7 @@ static long ConvertOSMenuResultToPPMenuResult(long menuResult) #pragma mark - -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); +static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); //================================================================= /* Constructor diff --git a/widget/src/mac/nsMacWindow.cpp b/widget/src/mac/nsMacWindow.cpp index e69150d08d24..1291c8299a2b 100644 --- a/widget/src/mac/nsMacWindow.cpp +++ b/widget/src/mac/nsMacWindow.cpp @@ -35,7 +35,7 @@ // Define Class IDs -- i hate having to do this -static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID); +static NS_DEFINE_CID(kCDragServiceCID, NS_DRAGSERVICE_CID); // from MacHeaders.c diff --git a/widget/src/mac/nsMenu.cpp b/widget/src/mac/nsMenu.cpp index af50dba91541..98afde6620c9 100644 --- a/widget/src/mac/nsMenu.cpp +++ b/widget/src/mac/nsMenu.cpp @@ -64,54 +64,14 @@ extern Handle gMDEF; // Our stub MDEF extern Handle gSystemMDEFHandle; PRInt16 mMacMenuIDCount = kMacMenuID; -// IIDs -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID); -static NS_DEFINE_IID(kIMenuBarIID, NS_IMENUBAR_IID); -static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID); -static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID); - - // CIDs #include "nsWidgetsCID.h" -static NS_DEFINE_IID(kMenuBarCID, NS_MENUBAR_CID); -static NS_DEFINE_IID(kMenuCID, NS_MENU_CID); -static NS_DEFINE_IID(kMenuItemCID, NS_MENUITEM_CID); +static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); +static NS_DEFINE_CID(kMenuCID, NS_MENU_CID); +static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID); //------------------------------------------------------------------------- -nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - if (aIID.Equals(kIMenuIID)) { - *aInstancePtr = (void*)(nsIMenu*) this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIMenuListenerIID)) { - *aInstancePtr = (void*) ((nsIMenuListener*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIDocumentObserverIID)) { - *aInstancePtr = (void*) ((nsIDocumentObserver*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - -NS_IMPL_ADDREF(nsMenu) -NS_IMPL_RELEASE(nsMenu) +NS_IMPL_ISUPPORTS3(nsMenu, nsIMenu, nsIMenuListener, nsIDocumentObserver) //------------------------------------------------------------------------- // @@ -198,7 +158,7 @@ NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel) if(aParent) { nsIMenuBar * menubar = nsnull; - aParent->QueryInterface(kIMenuBarIID, (void**) &menubar); + aParent->QueryInterface(NS_GET_IID(nsIMenuBar), (void**) &menubar); if(menubar) { mMenuBarParent = menubar; @@ -207,7 +167,7 @@ NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel) else { nsIMenu * menu = nsnull; - aParent->QueryInterface(kIMenuIID, (void**) &menu); + aParent->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu); { mMenuParent = menu; NS_RELEASE(menu); // Balance the QI @@ -224,9 +184,9 @@ NS_METHOD nsMenu::GetParent(nsISupports*& aParent) aParent = nsnull; if (nsnull != mMenuParent) { - return mMenuParent->QueryInterface(kISupportsIID,(void**)&aParent); + return mMenuParent->QueryInterface(NS_GET_IID(nsISupports),(void**)&aParent); } else if (nsnull != mMenuBarParent) { - return mMenuBarParent->QueryInterface(kISupportsIID,(void**)&aParent); + return mMenuBarParent->QueryInterface(NS_GET_IID(nsISupports),(void**)&aParent); } return NS_ERROR_FAILURE; @@ -319,7 +279,7 @@ NS_METHOD nsMenu::AddItem(nsISupports* aItem) { // Figure out what we're adding nsIMenuItem * menuitem = nsnull; - aItem->QueryInterface(kIMenuItemIID, (void**) &menuitem); + aItem->QueryInterface(NS_GET_IID(nsIMenuItem), (void**) &menuitem); if(menuitem) { // case menuitem @@ -329,7 +289,7 @@ NS_METHOD nsMenu::AddItem(nsISupports* aItem) else { nsIMenu * menu = nsnull; - aItem->QueryInterface(kIMenuIID, (void**) &menu); + aItem->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu); if(menu) { // case menu @@ -346,7 +306,7 @@ NS_METHOD nsMenu::AddMenuItem(nsIMenuItem * aMenuItem) { if(aMenuItem) { nsISupports * supports = nsnull; - aMenuItem->QueryInterface(kISupportsIID, (void**)&supports); + aMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**)&supports); if(supports) { mMenuItemVoidArray.AppendElement(supports); @@ -417,7 +377,7 @@ NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu) // Add a submenu if(aMenu) { nsISupports * supports = nsnull; - aMenu->QueryInterface(kISupportsIID, (void**)&supports); + aMenu->QueryInterface(NS_GET_IID(nsISupports), (void**)&supports); if(supports) { mMenuItemVoidArray.AppendElement(supports); @@ -490,7 +450,7 @@ NS_METHOD nsMenu::RemoveAll() if(mMenuItemVoidArray[mMenuItemVoidArray.Count() - 1]) { // Figure out what we're releasing nsIMenuItem * menuitem = nsnull; - ((nsISupports*)mMenuItemVoidArray[mMenuItemVoidArray.Count() - 1])->QueryInterface(kIMenuItemIID, (void**) &menuitem); + ((nsISupports*)mMenuItemVoidArray[mMenuItemVoidArray.Count() - 1])->QueryInterface(NS_GET_IID(nsIMenuItem), (void**) &menuitem); if(menuitem) { // case menuitem @@ -500,7 +460,7 @@ NS_METHOD nsMenu::RemoveAll() else { nsIMenu * menu = nsnull; - ((nsISupports*)mMenuItemVoidArray[mMenuItemVoidArray.Count() - 1])->QueryInterface(kIMenuIID, (void**) &menu); + ((nsISupports*)mMenuItemVoidArray[mMenuItemVoidArray.Count() - 1])->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu); if(menu) { // case menu @@ -641,7 +601,7 @@ nsEventStatus nsMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent) PRInt16 menuItemID = LoWord(((nsMenuEvent)aMenuEvent).mCommand); nsIMenuListener * menuListener = nsnull; if(mMenuItemVoidArray[menuItemID-1]) { - ((nsIMenuItem*)mMenuItemVoidArray[menuItemID-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsIMenuItem*)mMenuItemVoidArray[menuItemID-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if(menuListener) { eventStatus = menuListener->MenuItemSelected(aMenuEvent); NS_IF_RELEASE(menuListener); @@ -657,11 +617,11 @@ nsEventStatus nsMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent) if(nsnull != mMenuItemVoidArray[i-1]) { nsIMenu * submenu = nsnull; - ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(kIMenuIID, &submenu); + ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu), &submenu); if(submenu) { nsIMenuListener * menuListener = nsnull; - ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if(menuListener){ eventStatus = menuListener->MenuItemSelected(aMenuEvent); NS_IF_RELEASE(menuListener); @@ -720,11 +680,11 @@ nsEventStatus nsMenu::MenuSelected(const nsMenuEvent & aMenuEvent) if(nsnull != mMenuItemVoidArray[i-1]) { nsIMenu * submenu = nsnull; - ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(kIMenuIID, &submenu); + ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu), &submenu); if(submenu) { nsIMenuListener * menuListener = nsnull; - ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if(menuListener){ eventStatus = menuListener->MenuSelected(aMenuEvent); NS_IF_RELEASE(menuListener); @@ -1033,8 +993,7 @@ NS_METHOD nsMenu::SetWebShell(nsIWebShell * aWebShell) if (!doc) return NS_OK; - nsCOMPtr observer; - QueryInterface(kIDocumentObserverIID, getter_AddRefs(observer)); + nsCOMPtr observer = do_QueryInterface(NS_STATIC_CAST(nsIMenu*, this)); if(observer){ doc->AddObserver(observer); } @@ -1237,7 +1196,7 @@ void nsMenu::LoadMenuItem( menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd); // Create nsMenuItem nsIMenuItem * pnsMenuItem = nsnull; - nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem); + nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem); if (NS_OK == rv) { pnsMenuItem->Create(pParentMenu, menuitemName, 0); //printf("menuitem %s \n", menuitemName.ToNewCString()); @@ -1346,7 +1305,7 @@ void nsMenu::LoadMenuItem( pnsMenuItem->SetCheckboxType(PR_FALSE); nsISupports * supports = nsnull; - pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports); + pnsMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pParentMenu->AddItem(supports); // Parent should now own menu item NS_RELEASE(supports); @@ -1367,11 +1326,11 @@ void nsMenu::LoadSubMenu( // Create nsMenu nsIMenu * pnsMenu = nsnull; - nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu); + nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu); if (NS_OK == rv) { // Call Create nsISupports * supports = nsnull; - pParentMenu->QueryInterface(kISupportsIID, (void**) &supports); + pParentMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pnsMenu->Create(supports, menuName); NS_RELEASE(supports); // Balance QI @@ -1380,7 +1339,7 @@ void nsMenu::LoadSubMenu( // Make nsMenu a child of parent nsMenu. The parent takes ownership supports = nsnull; - pnsMenu->QueryInterface(kISupportsIID, (void**) &supports); + pnsMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pParentMenu->AddItem(supports); NS_RELEASE(supports); diff --git a/widget/src/mac/nsMenuBar.cpp b/widget/src/mac/nsMenuBar.cpp index 5a63c6f5505a..1561a7fca3dc 100644 --- a/widget/src/mac/nsMenuBar.cpp +++ b/widget/src/mac/nsMenuBar.cpp @@ -65,12 +65,6 @@ extern PRInt16 gCurrentMenuDepth; #include "nsMenu.h" // need to get APPLE_MENU_HACK macro // #endif -// IIDs -static NS_DEFINE_IID(kIMenuBarIID, NS_IMENUBAR_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID); -static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID); - // CIDs #include "nsWidgetsCID.h" static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); @@ -84,34 +78,7 @@ void InstallDefProc( Ptr dpAddr); //------------------------------------------------------------------------- -nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - if (aIID.Equals(kIMenuBarIID)) { - *aInstancePtr = (void*) ((nsIMenuBar*) this); - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*) ((nsISupports*)(nsIMenuBar*) this); - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIMenuListenerIID)) { - *aInstancePtr = (void*) ((nsIMenuListener*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - -NS_IMPL_ADDREF(nsMenuBar) -NS_IMPL_RELEASE(nsMenuBar) +NS_IMPL_ISUPPORTS2(nsMenuBar, nsIMenuBar, nsIMenuListener) //------------------------------------------------------------------------- // @@ -128,7 +95,7 @@ nsEventStatus nsMenuBar::MenuItemSelected(const nsMenuEvent & aMenuEvent) for (int i = mMenuVoidArray.Count(); i > 0; --i) { nsIMenuListener * menuListener = nsnull; - ((nsISupports*)mMenuVoidArray[i-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsISupports*)mMenuVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if(menuListener){ eventStatus = menuListener->MenuItemSelected(aMenuEvent); NS_RELEASE(menuListener); @@ -146,10 +113,10 @@ nsEventStatus nsMenuBar::MenuSelected(const nsMenuEvent & aMenuEvent) nsEventStatus eventStatus = nsEventStatus_eIgnore; nsIMenuListener * menuListener = nsnull; - //((nsISupports*)mMenuVoidArray[i-1])->QueryInterface(kIMenuListenerIID, &menuListener); + //((nsISupports*)mMenuVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); //printf("gPreviousMenuStack.Count() = %d \n", gPreviousMenuStack.Count()); if (gPreviousMenuStack[gPreviousMenuStack.Count() - 1]) - ((nsIMenu*)gPreviousMenuStack[gPreviousMenuStack.Count() - 1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsIMenu*)gPreviousMenuStack[gPreviousMenuStack.Count() - 1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if (menuListener) { //TODO: MenuSelected is the right thing to call... @@ -162,7 +129,7 @@ nsEventStatus nsMenuBar::MenuSelected(const nsMenuEvent & aMenuEvent) // If it's the help menu, gPreviousMenuStack won't be accurate so we need to get the listener a different way // We'll do it the old fashioned way of looping through and finding it for (int i = mMenuVoidArray.Count(); i > 0; --i) { - ((nsISupports*)mMenuVoidArray[i-1])->QueryInterface(kIMenuListenerIID, &menuListener); + ((nsISupports*)mMenuVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuListener), &menuListener); if (menuListener) { //TODO: MenuSelected is the right thing to call... //eventStatus = menuListener->MenuSelected(aMenuEvent); @@ -259,14 +226,14 @@ nsEventStatus nsMenuBar::MenuConstruct( } nsresult rv; - //nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID, nsnull, kIMenuBarIID, (void**)&pnsMenuBar); + //nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID, nsnull, NS_GET_IID(nsIMenuBar), (void**)&pnsMenuBar); //if (NS_OK == rv) { //if (nsnull != pnsMenuBar) { pnsMenuBar->Create(aParentWindow); // set pnsMenuBar as a nsMenuListener on aParentWindow nsCOMPtr menuListener; - pnsMenuBar->QueryInterface(kIMenuListenerIID, getter_AddRefs(menuListener)); + pnsMenuBar->QueryInterface(NS_GET_IID(nsIMenuListener), getter_AddRefs(menuListener)); aParentWindow->AddMenuListener(menuListener); //nsCOMPtr menuNode; @@ -289,11 +256,11 @@ nsEventStatus nsMenuBar::MenuConstruct( // Create nsMenu nsIMenu * pnsMenu = nsnull; - rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu); + rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu); if (NS_OK == rv) { // Call Create nsISupports * supports = nsnull; - pnsMenuBar->QueryInterface(kISupportsIID, (void**) &supports); + pnsMenuBar->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports); pnsMenu->Create(supports, menuName); NS_RELEASE(supports); @@ -444,7 +411,7 @@ NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu) { // XXX add to internal data structure nsISupports * supports = nsnull; - aMenu->QueryInterface(kISupportsIID, (void**)&supports); + aMenu->QueryInterface(NS_GET_IID(nsISupports), (void**)&supports); if(supports){ mMenuVoidArray.AppendElement( supports ); } @@ -494,7 +461,7 @@ NS_METHOD nsMenuBar::GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) } nsIMenu * menu = nsnull; - supports->QueryInterface(kISupportsIID, (void**)&menu); + supports->QueryInterface(NS_GET_IID(nsISupports), (void**)&menu); aMenu = menu; return NS_OK; diff --git a/widget/src/mac/nsMenuItem.cpp b/widget/src/mac/nsMenuItem.cpp index 8f19583cf8c9..e1e9759df1c8 100644 --- a/widget/src/mac/nsMenuItem.cpp +++ b/widget/src/mac/nsMenuItem.cpp @@ -34,41 +34,8 @@ #include "nsStringUtil.h" -static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID); -static NS_DEFINE_IID(kIMenuBarIID, NS_IMENUBAR_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIPopUpMenuIID, NS_IPOPUPMENU_IID); -static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID); - //------------------------------------------------------------------------- -nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - if (aIID.Equals(kIMenuItemIID)) { - *aInstancePtr = (void*)(nsIMenuItem*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)(nsIMenuItem*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIMenuListenerIID)) { - *aInstancePtr = (void*)(nsIMenuListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - -NS_IMPL_ADDREF(nsMenuItem) -NS_IMPL_RELEASE(nsMenuItem) +NS_IMPL_ISUPPORTS2(nsMenuItem, nsIMenuItem, nsIMenuListener) //------------------------------------------------------------------------- // @@ -168,7 +135,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent) // Bump the ref count on the parent, since it gets released unconditionally.. NS_ADDREF(parent); while (1) { - if (NS_OK == parent->QueryInterface(kIMenuIID,(void**)&menu)) { + if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIMenu),(void**)&menu)) { NS_RELEASE(parent); if (NS_OK != menu->GetParent(parent)) { NS_RELEASE(menu); @@ -176,7 +143,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent) } NS_RELEASE(menu); - } else if (NS_OK == parent->QueryInterface(kIPopUpMenuIID,(void**)&popup)) { + } else if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIPopUpMenu),(void**)&popup)) { if (NS_OK != popup->GetParent(widget)) { widget = nsnull; } @@ -184,7 +151,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent) NS_RELEASE(popup); return widget; - } else if (NS_OK == parent->QueryInterface(kIMenuBarIID,(void**)&menuBar)) { + } else if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIMenuBar),(void**)&menuBar)) { if (NS_OK != menuBar->GetParent(widget)) { widget = nsnull; } diff --git a/widget/src/mac/nsRadioButton.cpp b/widget/src/mac/nsRadioButton.cpp index 2a49030b337c..5aa5a104e238 100644 --- a/widget/src/mac/nsRadioButton.cpp +++ b/widget/src/mac/nsRadioButton.cpp @@ -51,21 +51,9 @@ nsRadioButton::~nsRadioButton() // // //------------------------------------------------------------------------- -nsresult nsRadioButton::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kIRadioButtonIID, NS_IRADIOBUTTON_IID); - if (aIID.Equals(kIRadioButtonIID)) { - *aInstancePtr = (void*) ((nsIRadioButton*)this); - AddRef(); - return NS_OK; - } - - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsRadioButton) + NS_INTERFACE_MAP_ENTRY(nsIRadioButton) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) #pragma mark - //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsScrollbar.cpp b/widget/src/mac/nsScrollbar.cpp index 23dfdf49a3e9..04d8a50fa97e 100644 --- a/widget/src/mac/nsScrollbar.cpp +++ b/widget/src/mac/nsScrollbar.cpp @@ -87,28 +87,9 @@ nsScrollbar::~nsScrollbar() { } -/**------------------------------------------------------------------------------- - * Implement the standard QueryInterface for NS_IWIDGET_IID and NS_ISUPPORTS_IID - * @update dc 08/31/98 - * @param aIID The name of the class implementing the method - * @param _classiiddef The name of the #define symbol that defines the IID - * for the class (e.g. NS_ISUPPORTS_IID) - */ -nsresult nsScrollbar::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kIScrollbarIID, NS_ISCROLLBAR_IID); - if (aIID.Equals(kIScrollbarIID)) { - *aInstancePtr = (void*) ((nsIScrollbar*)this); - AddRef(); - return NS_OK; - } - - return nsWindow::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsScrollbar) + NS_INTERFACE_MAP_ENTRY(nsIScrollbar) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) /**------------------------------------------------------------------------------- * ScrollActionProc Callback for TrackControl diff --git a/widget/src/mac/nsTextAreaWidget.cpp b/widget/src/mac/nsTextAreaWidget.cpp index 6817b7ebb90d..d1a689c980fe 100644 --- a/widget/src/mac/nsTextAreaWidget.cpp +++ b/widget/src/mac/nsTextAreaWidget.cpp @@ -145,25 +145,9 @@ nsTextAreaWidget::~nsTextAreaWidget() WEDispose(mTE_Data); } -/**------------------------------------------------------------------------------- - * Implement the standard QueryInterface for NS_IWIDGET_IID and NS_ISUPPORTS_IID - * @update dc 08/31/98 - * @param aIID The name of the class implementing the method - * @param _classiiddef The name of the #define symbol that defines the IID - * for the class (e.g. NS_ISUPPORTS_IID) - */ -nsresult nsTextAreaWidget::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - static NS_DEFINE_IID(kITextAreaWidgetIID, NS_ITEXTAREAWIDGET_IID); - - if (aIID.Equals(kITextAreaWidgetIID)) { - AddRef(); - *aInstancePtr = (void**)(nsITextAreaWidget*)this; - return NS_OK; - } - - return nsWindow::QueryInterface(aIID, aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsTextAreaWidget) + NS_INTERFACE_MAP_ENTRY(nsITextAreaWidget) +NS_INTERFACE_MAP_END_INHERITING(nsWindow) //------------------------------------------------------------------------- // diff --git a/widget/src/mac/nsTextWidget.cpp b/widget/src/mac/nsTextWidget.cpp index 72adbd0de6fa..53f4c260380b 100644 --- a/widget/src/mac/nsTextWidget.cpp +++ b/widget/src/mac/nsTextWidget.cpp @@ -134,20 +134,9 @@ nsTextWidget::Destroy() // // //------------------------------------------------------------------------- -nsresult nsTextWidget::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); - if (aIID.Equals(kITextWidgetIID)) { - AddRef(); - *aInstancePtr = (void**)(nsITextWidget*)this; - return NS_OK; - } - return Inherited::QueryInterface(aIID, aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsTextWidget) + NS_INTERFACE_MAP_ENTRY(nsITextWidget) +NS_INTERFACE_MAP_END_INHERITING(Inherited) #pragma mark - //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsToolkit.cpp b/widget/src/mac/nsToolkit.cpp index 95cf569a341a..745c1a7443be 100644 --- a/widget/src/mac/nsToolkit.cpp +++ b/widget/src/mac/nsToolkit.cpp @@ -31,13 +31,8 @@ #include "nsIServiceManager.h" // Class IDs... -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); - - -// Interface IDs... -static NS_DEFINE_IID(kIEventQueueIID, NS_IEVENTQUEUE_IID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); +static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); +static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static nsMacNSPREventQueueHandler* gEventQueueHandler = nsnull; @@ -110,8 +105,7 @@ void nsMacNSPREventQueueHandler::RepeatAction(const EventRecord& inMacEvent) #pragma mark - -NS_DEFINE_IID(kIToolkitIID, NS_ITOOLKIT_IID); -NS_IMPL_ISUPPORTS(nsToolkit,kIToolkitIID); +NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit); //------------------------------------------------------------------------- // diff --git a/widget/src/mac/nsWidgetFactory.cpp b/widget/src/mac/nsWidgetFactory.cpp index 6d3ef18c97b3..371400ca99fa 100644 --- a/widget/src/mac/nsWidgetFactory.cpp +++ b/widget/src/mac/nsWidgetFactory.cpp @@ -60,38 +60,35 @@ // NOTE the following does not match MAC_STATIC actually used below in this file! #define MACSTATIC -static NS_DEFINE_IID(kCWindow, NS_WINDOW_CID); -static NS_DEFINE_IID(kCPopUp, NS_POPUP_CID); -static NS_DEFINE_IID(kCChild, NS_CHILD_CID); -static NS_DEFINE_IID(kCButton, NS_BUTTON_CID); -static NS_DEFINE_IID(kCCheckButton, NS_CHECKBUTTON_CID); -static NS_DEFINE_IID(kCCombobox, NS_COMBOBOX_CID); -static NS_DEFINE_IID(kCFileOpen, NS_FILEWIDGET_CID); -static NS_DEFINE_IID(kCListbox, NS_LISTBOX_CID); -static NS_DEFINE_IID(kCRadioButton, NS_RADIOBUTTON_CID); -static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID); -static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID); -static NS_DEFINE_IID(kCTextArea, NS_TEXTAREA_CID); -static NS_DEFINE_IID(kCTextField, NS_TEXTFIELD_CID); -static NS_DEFINE_IID(kCAppShell, NS_APPSHELL_CID); -static NS_DEFINE_IID(kCToolkit, NS_TOOLKIT_CID); -static NS_DEFINE_IID(kCLookAndFeel, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kCLabel, NS_LABEL_CID); -static NS_DEFINE_IID(kCMenuBar, NS_MENUBAR_CID); -static NS_DEFINE_IID(kCMenu, NS_MENU_CID); -static NS_DEFINE_IID(kCMenuItem, NS_MENUITEM_CID); -static NS_DEFINE_IID(kCContextMenu, NS_CONTEXTMENU_CID); -static NS_DEFINE_IID(kCPopUpMenu, NS_POPUPMENU_CID); - -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); +static NS_DEFINE_CID(kCWindow, NS_WINDOW_CID); +static NS_DEFINE_CID(kCPopUp, NS_POPUP_CID); +static NS_DEFINE_CID(kCChild, NS_CHILD_CID); +static NS_DEFINE_CID(kCButton, NS_BUTTON_CID); +static NS_DEFINE_CID(kCCheckButton, NS_CHECKBUTTON_CID); +static NS_DEFINE_CID(kCCombobox, NS_COMBOBOX_CID); +static NS_DEFINE_CID(kCFileOpen, NS_FILEWIDGET_CID); +static NS_DEFINE_CID(kCListbox, NS_LISTBOX_CID); +static NS_DEFINE_CID(kCRadioButton, NS_RADIOBUTTON_CID); +static NS_DEFINE_CID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID); +static NS_DEFINE_CID(kCVertScrollbar, NS_VERTSCROLLBAR_CID); +static NS_DEFINE_CID(kCTextArea, NS_TEXTAREA_CID); +static NS_DEFINE_CID(kCTextField, NS_TEXTFIELD_CID); +static NS_DEFINE_CID(kCAppShell, NS_APPSHELL_CID); +static NS_DEFINE_CID(kCToolkit, NS_TOOLKIT_CID); +static NS_DEFINE_CID(kCLookAndFeel, NS_LOOKANDFEEL_CID); +static NS_DEFINE_CID(kCLabel, NS_LABEL_CID); +static NS_DEFINE_CID(kCMenuBar, NS_MENUBAR_CID); +static NS_DEFINE_CID(kCMenu, NS_MENU_CID); +static NS_DEFINE_CID(kCMenuItem, NS_MENUITEM_CID); +static NS_DEFINE_CID(kCContextMenu, NS_CONTEXTMENU_CID); +static NS_DEFINE_CID(kCPopUpMenu, NS_POPUPMENU_CID); // Drag and Drop/Clipboard -static NS_DEFINE_IID(kCDataFlavor, NS_DATAFLAVOR_CID); -static NS_DEFINE_IID(kCClipboard, NS_CLIPBOARD_CID); -static NS_DEFINE_IID(kCTransferable, NS_TRANSFERABLE_CID); -static NS_DEFINE_IID(kCXIFFormatConverter, NS_XIFFORMATCONVERTER_CID); -static NS_DEFINE_IID(kCDragService, NS_DRAGSERVICE_CID); +static NS_DEFINE_CID(kCDataFlavor, NS_DATAFLAVOR_CID); +static NS_DEFINE_CID(kCClipboard, NS_CLIPBOARD_CID); +static NS_DEFINE_CID(kCTransferable, NS_TRANSFERABLE_CID); +static NS_DEFINE_CID(kCXIFFormatConverter, NS_XIFFORMATCONVERTER_CID); +static NS_DEFINE_CID(kCDragService, NS_DRAGSERVICE_CID); // Sound services (just Beep for now) static NS_DEFINE_CID(kCSound, NS_SOUND_CID); @@ -139,30 +136,7 @@ nsWidgetFactory::~nsWidgetFactory() //------------------------------------------------------------------------- // //------------------------------------------------------------------------- -nsresult nsWidgetFactory::QueryInterface(const nsIID &aIID, - void **aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - if (aIID.Equals(kIFactoryIID)) { - *aInstancePtr = (void*)(nsWidgetFactory*)this; - AddRef(); - return NS_OK; - } - - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)(nsWidgetFactory*)this; - AddRef(); - return NS_OK; - } - - return NS_NOINTERFACE; -} - -NS_IMPL_ADDREF(nsWidgetFactory) -NS_IMPL_RELEASE(nsWidgetFactory) +NS_IMPL_ISUPPORTS1(nsWidgetFactory, nsIFactory) //------------------------------------------------------------------------- // @@ -319,5 +293,5 @@ NSGetFactory(nsISupports* serviceMgr, return NS_ERROR_OUT_OF_MEMORY; } - return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory); + return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory), (void**)aFactory); } diff --git a/widget/src/mac/nsWidgetSupport.cpp b/widget/src/mac/nsWidgetSupport.cpp index 917e446b8acf..fb840a2c98ab 100644 --- a/widget/src/mac/nsWidgetSupport.cpp +++ b/widget/src/mac/nsWidgetSupport.cpp @@ -44,18 +44,6 @@ -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); -static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); -static NS_DEFINE_IID(kIFileWidgetIID, NS_IFILEWIDGET_IID); -static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); -static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); -static NS_DEFINE_IID(kIRadioButtonIID, NS_IRADIOBUTTON_IID); -static NS_DEFINE_IID(kILabelIID, NS_ILABEL_IID); -static NS_DEFINE_IID(kIScrollBarIID, NS_ISCROLLBAR_IID); - - NS_WIDGET nsresult NS_CreateButton(nsISupports* aParent, nsIButton* aButton, @@ -65,10 +53,10 @@ NS_CreateButton(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget; - if (NS_OK == aButton->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aButton->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -90,10 +78,10 @@ NS_CreateCheckButton(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget; - if (NS_OK == aCheckButton->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aCheckButton->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -117,10 +105,10 @@ NS_CreateRadioButton( nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget; - if (NS_OK == aRadioButton->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aRadioButton->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -141,10 +129,10 @@ NS_CreateLabel( nsISupports* aParent, const nsFont* aFont) { nsIWidget* parent = nsnull; - if (NS_OK == aParent->QueryInterface(kIWidgetIID,(void**)&parent)) + if (NS_OK == aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent)) { nsIWidget* widget; - if (NS_OK == aLabel->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aLabel->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -167,10 +155,10 @@ NS_CreateTextAreaWidget(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -179,7 +167,7 @@ NS_CreateTextAreaWidget(nsISupports* aParent, } else { - NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object"); + NS_ERROR("Called QueryInterface on a non nsIWidget supported object"); } if (aParent) @@ -197,10 +185,10 @@ NS_CreateTextWidget(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -209,7 +197,7 @@ NS_CreateTextWidget(nsISupports* aParent, } else { - NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object"); + NS_ERROR("Called QueryInterface on a non nsIWidget supported object"); } if (aParent) @@ -228,17 +216,17 @@ NS_CreateScrollBar(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); NS_IF_RELEASE(widget); } else { - NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object"); + NS_ERROR("Called QueryInterface on a non nsIWidget supported object"); } if (aParent) @@ -256,10 +244,10 @@ NS_CreateListBox(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -268,7 +256,7 @@ NS_CreateListBox(nsISupports* aParent, } else { - NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object"); + NS_ERROR("Called QueryInterface on a non nsIWidget supported object"); } if (aParent) @@ -287,10 +275,10 @@ NS_CreateComboBox(nsISupports* aParent, { nsIWidget* parent = nsnull; if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); + aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent); nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Create(parent, aRect, aHandleEventFunction, NULL); widget->Show(PR_TRUE); if (aFont != nsnull) @@ -299,7 +287,7 @@ NS_CreateComboBox(nsISupports* aParent, } else { - NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object"); + NS_ERROR("Called QueryInterface on a non nsIWidget supported object"); } if (aParent) @@ -313,7 +301,7 @@ NS_ShowWidget(nsISupports* aWidget, PRBool aShow) { nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Show(aShow); NS_IF_RELEASE(widget); } @@ -326,7 +314,7 @@ NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY) { nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Move(aX,aY); NS_IF_RELEASE(widget); } @@ -338,7 +326,7 @@ NS_EnableWidget(nsISupports* aWidget, PRBool aEnable) { void* result = nsnull; nsIWidget* widget; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->Enable(aEnable); NS_RELEASE(widget); @@ -352,7 +340,7 @@ NS_SetFocusToWidget(nsISupports* aWidget) { nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { widget->SetFocus(); NS_IF_RELEASE(widget); } @@ -365,7 +353,7 @@ NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData) { void* result = nsnull; nsIWidget* widget; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) + if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) { result = widget->GetNativeData(NS_NATIVE_WIDGET); NS_RELEASE(widget); diff --git a/widget/src/mac/nsWindow.cpp b/widget/src/mac/nsWindow.cpp index 8c94d1ece372..a6b18e8eebf5 100644 --- a/widget/src/mac/nsWindow.cpp +++ b/widget/src/mac/nsWindow.cpp @@ -160,20 +160,10 @@ nsWindow::~nsWindow() NS_IMPL_ADDREF(nsWindow); NS_IMPL_RELEASE(nsWindow); -nsresult nsWindow::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(nsIKBStateControl::GetIID())) { - *aInstancePtr = (void*) ((nsIKBStateControl*)this); - AddRef(); - return NS_OK; - } - - return nsBaseWidget::QueryInterface(aIID,aInstancePtr); -} +NS_INTERFACE_MAP_BEGIN(nsWindow) + NS_INTERFACE_MAP_ENTRY(nsIKBStateControl) +NS_INTERFACE_MAP_END_INHERITING(nsBaseWidget) //------------------------------------------------------------------------- // diff --git a/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp b/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp index 2c7f05ef0e27..c42f8403d659 100644 --- a/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp +++ b/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp @@ -34,35 +34,9 @@ #undef NS_FILE_FAILURE #define NS_FILE_FAILURE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES,(0xFFFF)) -NS_IMPL_ADDREF(nsFileSpecWithUIImpl) -NS_IMPL_RELEASE(nsFileSpecWithUIImpl) +NS_IMPL_ISUPPORTS2(nsFileSpecWithUIImpl, nsIFileSpecWithUI, nsIFileSpec) -NS_IMETHODIMP nsFileSpecWithUIImpl::QueryInterface(REFNSIID aIID, - void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - static NS_DEFINE_IID(kClassIID, nsCOMTypeInfo::GetIID()); - if (aIID.Equals(kClassIID)) - *aInstancePtr = (void*) this; - else if (aIID.Equals(nsCOMTypeInfo::GetIID())) - *aInstancePtr = (void*) this; - else if (aIID.Equals(nsCOMTypeInfo::GetIID())) - *aInstancePtr = (void*) ((nsISupports*)this); - - if (*aInstancePtr) - { - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - -static NS_DEFINE_IID(kCFileWidgetCID, NS_FILEWIDGET_CID); +static NS_DEFINE_CID(kCFileWidgetCID, NS_FILEWIDGET_CID); #include "nsIComponentManager.h" diff --git a/widget/src/xpwidgets/nsXIFFormatConverter.cpp b/widget/src/xpwidgets/nsXIFFormatConverter.cpp index 26f23b345f62..fb8496cdf815 100644 --- a/widget/src/xpwidgets/nsXIFFormatConverter.cpp +++ b/widget/src/xpwidgets/nsXIFFormatConverter.cpp @@ -53,7 +53,7 @@ #include "nsPrimitiveHelpers.h" -static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); // don't panic. NS_PARSER_IID just has the wrong name. +static NS_DEFINE_CID(kCParserCID, NS_PARSER_IID); // don't panic. NS_PARSER_IID just has the wrong name. NS_IMPL_ADDREF(nsXIFFormatConverter) NS_IMPL_RELEASE(nsXIFFormatConverter)