Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Cornu2003-08-20 18:46:29 +0000
committerChristophe Cornu2003-08-20 18:46:29 +0000
commit383212507c0751964afa098bf3ba13991fe6c574 (patch)
tree664b1868fa5d2304b7b94b5f94880ef465139eab
parent5a493b6b89d8cfe5ccf3f7729ece2b125f3512f5 (diff)
downloadeclipse.platform.swt-383212507c0751964afa098bf3ba13991fe6c574.tar.gz
eclipse.platform.swt-383212507c0751964afa098bf3ba13991fe6c574.tar.xz
eclipse.platform.swt-383212507c0751964afa098bf3ba13991fe6c574.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Browser.java7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/NsWidgetsCID.java58
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java6
3 files changed, 9 insertions, 62 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Browser.java
index 96f9353557..0bab03a23f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Browser.java
@@ -134,9 +134,10 @@ public Browser(Composite parent, int style) {
newEvent.current = nProgress;
newEvent.total = nProgressMax;
if (progressListeners != null) {
- for (int i = 0; i < progressListeners.length; i++)
- progressListeners[i].changed(newEvent);
- if (nProgress == -1) {
+ if (nProgress != -1) {
+ for (int i = 0; i < progressListeners.length; i++)
+ progressListeners[i].changed(newEvent);
+ } else {
for (int i = 0; i < progressListeners.length; i++)
progressListeners[i].completed(newEvent);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/NsWidgetsCID.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/NsWidgetsCID.java
deleted file mode 100644
index 93b1f7712e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/NsWidgetsCID.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public final class NsWidgetsCID {
- public static final nsID NS_WINDOW_CID = new nsID("2d96b3d0-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_CHILD_CID = new nsID("2d96b3d1-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_POPUP_CID = new nsID("BA7DE611-6088-11d3-A83E-00105A183419");
- public static final nsID NS_BUTTON_CID = new nsID("2d96b3d2-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_CHECKBUTTON_CID = new nsID("2d96b3d3-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_FILEPICKER_CID = new nsID("bd57cee8-1dd1-11b2-9fe7-95cf4709aea3");
- public static final nsID NS_HORZSCROLLBAR_CID = new nsID("2d96b3d9-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_VERTSCROLLBAR_CID = new nsID("2d96b3da-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_NATIVESCROLLBAR_CID = new nsID("c2281100-3b4b-11d6-a384-f705fd0766fc");
- public static final nsID NS_TEXTFIELD_CID = new nsID("2d96b3dc-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_APPSHELL_CID = new nsID("2d96b3df-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_TOOLKIT_CID = new nsID("2d96b3e0-c051-11d1-a827-0040959a28c9");
- public static final nsID NS_LOOKANDFEEL_CID = new nsID("21B51DE0-21A3-11d2-B6E0-00805F8A2676");
- public static final nsID NS_DIALOG_CID = new nsID("4A781D61-3D28-11d2-8DB8-00609703C14E");
- public static final nsID NS_LABEL_CID = new nsID("F3131891-3DC7-11d2-8DB8-00609703C14E");
- public static final nsID NS_MENUBAR_CID = new nsID("BC658C81-4BEB-11d2-8DBB-00609703C14E");
- public static final nsID NS_MENU_CID = new nsID("35A3DEC1-4992-11d2-8DBA-00609703C14E");
- public static final nsID NS_MENUITEM_CID = new nsID("7F045771-4BEB-11d2-8DBB-00609703C14E");
- public static final nsID NS_POPUPMENU_CID = new nsID("F6CD4F21-53AF-11d2-8DC4-00609703C14E");
- public static final nsID NS_DRAGSERVICE_CID = new nsID("8B5314BB-DB01-11d2-96CE-0060B0FB9956");
- public static final nsID NS_TRANSFERABLE_CID = new nsID("8B5314BC-DB01-11d2-96CE-0060B0FB9956");
- public static final nsID NS_CLIPBOARD_CID = new nsID("8B5314BA-DB01-11d2-96CE-0060B0FB9956");
- public static final nsID NS_CLIPBOARDHELPER_CID = new nsID("77221D5A-1DD2-11B2-8C69-C710F15D2ED5");
- public static final nsID NS_DATAFLAVOR_CID = new nsID("8B5314BD-DB01-11d2-96CE-0060B0FB9956");
- public static final nsID NS_HTMLFORMATCONVERTER_CID = new nsID("948A0023-E3A7-11d2-96CF-0060B0FB9956");
- public static final nsID NS_SOUND_CID = new nsID("B148EED2-236D-11d3-B35C-00A0CC3C1CDE");
- public static final nsID NS_BIDIKEYBOARD_CID = new nsID("2572E6B0-7439-11d4-B77A-00104B4119F8");
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index d9a668c183..1092009354 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -40,7 +40,11 @@ public class XPCOM {
/* Load the SWT Mozilla library */
Library.loadLibrary ("swt-mozilla"); //$NON-NLS-1$
}
-
+
+ /* NsWidgetCID constants */
+ public static final nsID NS_APPSHELL_CID = new nsID("2d96b3df-c051-11d1-a827-0040959a28c9"); //$NON-NLS-1$
+
+ /* XPCOM constants */
public static final int NS_OK = 0;
public static final int NS_COMFALSE = 1;
public static final int NS_ERROR_BASE = 0xc1f30000;

Back to the top