43091EclipseCon1_1

3 files changed, 6 insertions, 3 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java
index 66351f78f8..1190c1fe87 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java
@@ -38,9 +38,9 @@ public interface LocationListener extends SWTEventListener {
  * <p>The following fields in the <code>LocationEvent</code> apply:
  * <ul>
  * <li>(in) location the location to be loaded
- * <li>(in) doit can be set to <code>false</code> to prevent the location
- * from being loaded 
  * <li>(in) widget the <code>Browser</code> whose location is changing
+ * <li>(in/out) doit can be set to <code>false</code> to prevent the location
+ * from being loaded 
  * </ul>
  * 
  * @param event the <code>LocationEvent</code> that specifies the location
@@ -57,6 +57,8 @@ public void changing(LocationEvent event);
  * <p>The following fields in the <code>LocationEvent</code> apply:
  * <ul>
  * <li>(in) location the current location
+ * <li>(in) top <code>true</code> if the location opens in the top frame or
+ * <code>false</code> otherwise
  * <li>(in) widget the <code>Browser</code> whose location has changed
  * </ul>
  * 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Browser.java
index 9a554238d4..0d14c217c4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Browser.java
@@ -509,6 +509,7 @@ int Pt_CB_WEB_COMPLETE(int info) {
 	event.display = display;
 	event.widget = this;
 	event.location = url;
+	event.top = true;
 	for (int i = 0; i < locationListeners.length; i++)
 		locationListeners[i].changed(event);
 	ProgressEvent progress = new ProgressEvent(this);
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java
index 89766919b2..d9e8d22048 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java
@@ -146,7 +146,7 @@ public BrowserExample(Composite parent) {
 		browser.addLocationListener(new LocationListener() {
 			public void changed(LocationEvent event) {
 				busy = true;
-				location.setText(event.location);
+				if (event.top) location.setText(event.location);
 			}
 			public void changing(LocationEvent event) {
 			}