diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2012-05-29 10:41:18 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2012-05-29 10:41:18 -0400 |
| commit | 4fe717a87174d79297786da070f9cdd2d233f54a (patch) | |
| tree | 30e0cf9ca9be087467fd4c9a83194a7463676baa /bundles/org.eclipse.swt/Eclipse SWT Mozilla | |
| parent | 0ccce2455aaf79db752792a412e87db0472b05bc (diff) | |
| download | eclipse.platform.swt-4fe717a87174d79297786da070f9cdd2d233f54a.tar.gz eclipse.platform.swt-4fe717a87174d79297786da070f9cdd2d233f54a.tar.xz eclipse.platform.swt-4fe717a87174d79297786da070f9cdd2d233f54a.zip | |
Bug 365280 - Combo box closes self when Mozilla Browser present
(improved)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Mozilla')
2 files changed, 3 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java index 890f5a61bf..df87e15f40 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java @@ -23,7 +23,7 @@ class MozillaDelegate { Listener listener; boolean hasFocus; - static final String SET_MOZILLA_COUNT = "org.eclipse.swt.internal.setMozillaCount"; //$NON-NLS-1$ + static final String MOZILLA_RUNNING = "org.eclipse.swt.internal.mozillaRunning"; //$NON-NLS-1$ MozillaDelegate (Browser browser) { super (); @@ -125,7 +125,7 @@ void addWindowSubclass () { } int createBaseWindow (nsIBaseWindow baseWindow) { - browser.getDisplay ().setData (SET_MOZILLA_COUNT, new Integer (Mozilla.BrowserCount)); + browser.getDisplay ().setData (MOZILLA_RUNNING, Boolean.TRUE); /* * Feature of Mozilla on OSX. Mozilla replaces the OSX application menu whenever @@ -194,7 +194,6 @@ void onDispose (int /*long*/ embedHandle) { eventShell = null; listener = null; } - browser.getDisplay ().setData (SET_MOZILLA_COUNT, new Integer (Mozilla.BrowserCount)); browser = null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index 481c148c1a..c4ed39d3de 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -2708,12 +2708,11 @@ void onDispose (Display display) { } functions = null; - BrowserCount--; - delegate.onDispose (embedHandle); delegate = null; embedHandle = 0; + BrowserCount--; } void Activate () { |