From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- toolkit/components/windowwatcher/moz.build | 1 - .../components/windowwatcher/nsIPromptService.idl | 2 +- .../components/windowwatcher/nsPIPromptService.idl | 30 ---------------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 toolkit/components/windowwatcher/nsPIPromptService.idl (limited to 'toolkit/components/windowwatcher') diff --git a/toolkit/components/windowwatcher/moz.build b/toolkit/components/windowwatcher/moz.build index 73479b38c9..5879fb8f16 100644 --- a/toolkit/components/windowwatcher/moz.build +++ b/toolkit/components/windowwatcher/moz.build @@ -16,7 +16,6 @@ XPIDL_SOURCES += [ "nsIPromptFactory.idl", "nsIPromptService.idl", "nsIWindowWatcher.idl", - "nsPIPromptService.idl", "nsPIWindowWatcher.idl", ] diff --git a/toolkit/components/windowwatcher/nsIPromptService.idl b/toolkit/components/windowwatcher/nsIPromptService.idl index 66f23ffb5b..890bd062ba 100644 --- a/toolkit/components/windowwatcher/nsIPromptService.idl +++ b/toolkit/components/windowwatcher/nsIPromptService.idl @@ -263,7 +263,7 @@ interface nsIPromptService : nsISupports const unsigned long BUTTON_DELAY_ENABLE = 1 << 26; /** - * Causes a spinner to be displayed in the dialog box. + * Causes a spinner to be displayed next to the title in the dialog box. */ const unsigned long SHOW_SPINNER = 1 << 27; diff --git a/toolkit/components/windowwatcher/nsPIPromptService.idl b/toolkit/components/windowwatcher/nsPIPromptService.idl deleted file mode 100644 index 3bff27a993..0000000000 --- a/toolkit/components/windowwatcher/nsPIPromptService.idl +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* The general dialog posing function within nsPromptService, for - private consumption, only. */ - -#include "nsISupports.idl" - -interface nsIDOMWindow; -interface nsIDialogParamBlock; - -[uuid(C60A1955-6CB3-4827-8EF8-4F5C668AF0B3)] -interface nsPIPromptService : nsISupports -{ -%{C++ - // eOpeningSound is obsolete but we need to support it for the compatibility. - // The implementers should use eSoundEventId instead. - enum {eMsg=0, eCheckboxMsg=1, eIconClass=2, eTitleMessage=3, eEditfield1Msg=4, - eEditfield2Msg=5, eEditfield1Value=6, eEditfield2Value=7, - eButton0Text=8, eButton1Text=9, eButton2Text=10, eButton3Text=11, - eDialogTitle=12, eOpeningSound=13}; - enum {eButtonPressed=0, eCheckboxState=1, eNumberButtons=2, - eNumberEditfields=3, eEditField1Password=4, eDefaultButton=5, - eDelayButtonEnable=6, eSoundEventId=7}; -%} - - void doDialog(in nsIDOMWindow aParent, in nsIDialogParamBlock aParamBlock, in string aChromeURL); -}; -- cgit v1.2.3