From 920ec7a2f09f9e035003c3eedb4148bf8348f710 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Sat, 12 Jun 1999 21:40:10 +0000 Subject: [PATCH] Removing NS_CreateDialog(), nsDialog is obsolete. --- widget/public/nsWidgetSupport.h | 9 +- widget/src/mac/nsWidgetSupport.cpp | 28 -- widget/src/photon/nsWidgetSupport.cpp | 498 -------------------------- 3 files changed, 1 insertion(+), 534 deletions(-) diff --git a/widget/public/nsWidgetSupport.h b/widget/public/nsWidgetSupport.h index 43dd416a964..e1f432fd277 100644 --- a/widget/public/nsWidgetSupport.h +++ b/widget/public/nsWidgetSupport.h @@ -39,25 +39,18 @@ class nsIMouseListener; class nsITabWidget; class nsIToolkit; class nsIWidget; -class nsIDialog; class nsICheckButton; class nsIScrollbar; class nsIRadioButton; class nsITooltipWidget; class nsITextWidget; +class nsIBrowserWindow; // These are a series of support methods which help in the creation // of widgets. They are not needed, but are provided as a convenience // mechanism when creating widgets -extern NS_WIDGET nsresult -NS_CreateDialog(nsISupports* aParent, - nsIDialog* aDialog, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont = nsnull); - extern NS_WIDGET nsresult NS_CreateButton( nsISupports* aParent, nsIButton* aButton, diff --git a/widget/src/mac/nsWidgetSupport.cpp b/widget/src/mac/nsWidgetSupport.cpp index 53e86f97cb9..5981e8cfd43 100644 --- a/widget/src/mac/nsWidgetSupport.cpp +++ b/widget/src/mac/nsWidgetSupport.cpp @@ -33,7 +33,6 @@ #include "nsITabWidget.h" #include "nsIToolkit.h" #include "nsIWidget.h" -#include "nsIDialog.h" #include "nsICheckButton.h" #include "nsIScrollbar.h" #include "nsIRadioButton.h" @@ -49,39 +48,12 @@ 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(kIDialogIID, NS_IDIALOG_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_CreateDialog(nsISupports* aParent, - nsIDialog* aDialog, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ - nsIWidget* parent = nsnull; - if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); - - nsIWidget* widget; - if (NS_OK == aDialog->QueryInterface(kIWidgetIID,(void**)&widget)) - { - widget->Create(parent, aRect, aHandleEventFunction, NULL); - widget->Show(PR_TRUE); - if (aFont != nsnull) - widget->SetFont(*aFont); - NS_IF_RELEASE(widget); - } - if (aParent != nsnull) - NS_IF_RELEASE(parent); - return NS_OK; -} - - NS_WIDGET nsresult NS_CreateButton(nsISupports* aParent, nsIButton* aButton, diff --git a/widget/src/photon/nsWidgetSupport.cpp b/widget/src/photon/nsWidgetSupport.cpp index be61008fb78..e69de29bb2d 100644 --- a/widget/src/photon/nsWidgetSupport.cpp +++ b/widget/src/photon/nsWidgetSupport.cpp @@ -1,498 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - - -//#include "nsWidgetSupport.h" -#include "nsRect.h" -#include "nsITextAreaWidget.h" -#include "nsIFileWidget.h" -#include "nsIAppShell.h" -#include "nsIButton.h" -#include "nsIComboBox.h" -#include "nsIEventListener.h" -#include "nsILabel.h" -#include "nsIListBox.h" -#include "nsIListWidget.h" -#include "nsILookAndFeel.h" -#include "nsIMouseListener.h" -#include "nsITabWidget.h" -#include "nsIToolkit.h" -#include "nsIWidget.h" -#include "nsIDialog.h" -#include "nsICheckButton.h" -#include "nsIScrollbar.h" -#include "nsIRadioButton.h" -#include "nsITooltipWidget.h" -#include "nsITextWidget.h" - - -#include "nsPhWidgetLog.h" - -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(kIDialogIID, NS_IDIALOG_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_CreateDialog(nsISupports* aParent, - nsIDialog* aDialog, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateDialog\n")); - - nsIWidget* parent = nsnull; - if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); - - nsIWidget* widget; - if (NS_OK == aDialog->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Create(parent, aRect, aHandleEventFunction, NULL); - widget->Show(PR_TRUE); - if (aFont != nsnull) - widget->SetFont(*aFont); - NS_IF_RELEASE(widget); - } - if (aParent != nsnull) - NS_IF_RELEASE(parent); - return NS_OK; -} - - -NS_WIDGET nsresult -NS_CreateButton(nsISupports* aParent, - nsIButton* aButton, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateButton\n")); - - nsIWidget* parent = nsnull; - if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); - - nsIWidget* widget; - if (NS_OK == aButton->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Create(parent, aRect, aHandleEventFunction, NULL); - widget->Show(PR_TRUE); - if (aFont != nsnull) - widget->SetFont(*aFont); - NS_IF_RELEASE(widget); - } - - if (aParent != nsnull) - NS_IF_RELEASE(parent); - return NS_OK; -} - - - -NS_WIDGET nsresult -NS_CreateCheckButton(nsISupports* aParent, - nsICheckButton* aCheckButton, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateCheckButton\n")); - - nsIWidget* parent = nsnull; - if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); - - nsIWidget* widget; - if (NS_OK == aCheckButton->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Create(parent, aRect, aHandleEventFunction, NULL); - widget->Show(PR_TRUE); - if (aFont != nsnull) - widget->SetFont(*aFont); - NS_IF_RELEASE(widget); - } - if (aParent != nsnull) - NS_IF_RELEASE(parent); - return NS_OK; -} - - - -NS_WIDGET nsresult -NS_CreateRadioButton( nsISupports* aParent, - nsIRadioButton* aRadioButton, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateRadioButton\n")); - - nsIWidget* parent = nsnull; - if (aParent != nsnull) - aParent->QueryInterface(kIWidgetIID,(void**)&parent); - - nsIWidget* widget; - if (NS_OK == aRadioButton->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Create(parent, aRect, aHandleEventFunction, NULL); - widget->Show(PR_TRUE); - if (aFont != nsnull) - widget->SetFont(*aFont); - NS_IF_RELEASE(widget); - } - if (aParent != nsnull) - NS_IF_RELEASE(parent); - return NS_OK; -} - - -NS_WIDGET nsresult -NS_CreateLabel( nsISupports* aParent, - nsILabel* aLabel, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateLabel\n")); - - nsIWidget* parent = nsnull; - if (NS_OK == aParent->QueryInterface(kIWidgetIID,(void**)&parent)) - { - nsIWidget* widget; - if (NS_OK == aLabel->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Create(parent, aRect, aHandleEventFunction, NULL); - widget->Show(PR_TRUE); - if (aFont != nsnull) - widget->SetFont(*aFont); - NS_IF_RELEASE(widget); - } - NS_IF_RELEASE(parent); - } - return NS_OK; -} - - - -NS_WIDGET nsresult -NS_CreateTextAreaWidget(nsISupports* aParent, - nsITextAreaWidget* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateTextArea\n")); - - 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; -} - -NS_WIDGET nsresult -NS_CreateTextWidget(nsISupports* aParent, - nsITextWidget* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateTextWidget\n")); - - 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; -} - - - -NS_WIDGET nsresult -NS_CreateScrollBar(nsISupports* aParent, - nsIScrollbar* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateScrollBar\n")); - - 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); - NS_IF_RELEASE(widget); - } - else - { - NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object"); - } - - if (aParent) - NS_IF_RELEASE(parent); - - return NS_OK; -} - -NS_WIDGET nsresult -NS_CreateListBox(nsISupports* aParent, - nsIListBox* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateListBox\n")); - - 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; -} - - -NS_WIDGET nsresult -NS_CreateComboBox(nsISupports* aParent, - nsIComboBox* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateComboBox\n")); - - 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; -} - - -NS_WIDGET nsresult -NS_CreateTabWidget(nsISupports* aParent, - nsITabWidget* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateTabWidget\n")); - - 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; -} - - - - - -NS_WIDGET nsresult -NS_CreateTooltipWidget(nsISupports* aParent, - nsITooltipWidget* aWidget, - const nsRect& aRect, - EVENT_CALLBACK aHandleEventFunction, - const nsFont* aFont) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_CreateTooltipWidget\n")); - - 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("Call QueryInterface on a non kIWidgetIID supported object"); - } - - if (aParent) - NS_IF_RELEASE(parent); - - return NS_OK; -} - - -NS_WIDGET nsresult -NS_ShowWidget(nsISupports* aWidget, PRBool aShow) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_ShowWidget\n")); - - nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Show(aShow); - NS_IF_RELEASE(widget); - } - - return NS_OK; -} - -NS_WIDGET nsresult -NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_MoveWidget\n")); - - nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->Move(aX,aY); - NS_IF_RELEASE(widget); - } - return NS_OK; -} - -NS_WIDGET nsresult -NS_EnableWidget(nsISupports* aWidget, PRBool aEnable) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_EnableWidget\n")); - - void* result = nsnull; - nsIWidget* widget; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) - { - widget->Enable(aEnable); - NS_RELEASE(widget); - } - return NS_OK; -} - - -NS_WIDGET nsresult -NS_SetFocusToWidget(nsISupports* aWidget) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_SetFocusToWidget\n")); - - nsIWidget* widget = nsnull; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) { - widget->SetFocus(); - NS_IF_RELEASE(widget); - } - return NS_OK; -} - - -NS_WIDGET nsresult -NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData) -{ -PR_LOG(PhWidLog, PR_LOG_DEBUG, "nsWidgetSupport::NS_GetWidgetNativeData\n")); - - void* result = nsnull; - nsIWidget* widget; - if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) - { - result = widget->GetNativeData(NS_NATIVE_WIDGET); - NS_RELEASE(widget); - } - *aNativeData = result; - return NS_OK; - -}