# HG changeset patch
# User dadubrow
# Date 1266528216 21600
# Node ID a690706fd137b885077a6f3c2c3595c16388143a
# Parent  bf0a333d965d59626c8a30add57698506b38b06a# Parent  5d016a880824768f3c8f295a0237ef1f186ccdac
merge

diff -r 5d016a880824 -r a690706fd137 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java	Thu Feb 18 15:11:20 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java	Thu Feb 18 15:23:36 2010 -0600
@@ -169,7 +169,6 @@
 		if (dialog.open() == Window.OK) {
 			data.apply(dialogData);
 			refresh();
-			launchOptionsPage.getWizard().getContainer().getShell().pack();
 		}
 	}
 
diff -r 5d016a880824 -r a690706fd137 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java	Thu Feb 18 15:11:20 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java	Thu Feb 18 15:23:36 2010 -0600
@@ -94,7 +94,6 @@
 			
 		descriptionLabel.setText(msg);
 		launchOptionsPage.changed();
-		launchOptionsPage.getWizard().getContainer().getShell().pack();
 	}
 	
 	@Override
diff -r 5d016a880824 -r a690706fd137 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java	Thu Feb 18 15:11:20 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java	Thu Feb 18 15:23:36 2010 -0600
@@ -69,7 +69,6 @@
 		final Label label = new Label(composite, SWT.WRAP);
 		label.setText(description);
 		GridData labelData = GridDataFactory.fillDefaults().grab(true, false).create();
-		labelData.widthHint = 500;
 		label.setLayoutData(labelData);
 		
 		// spacer
diff -r 5d016a880824 -r a690706fd137 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java	Thu Feb 18 15:11:20 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java	Thu Feb 18 15:23:36 2010 -0600
@@ -27,6 +27,7 @@
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 
 import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 import com.nokia.cdt.internal.debug.launch.newwizard.IWizardSection.ISectionChangeListener;
@@ -174,5 +175,9 @@
 	 */
 	public void changed() {
 		validatePage();
+		Control control = getControl();
+		if (control != null && !control.isDisposed())
+			getWizard().getContainer().getShell().pack();
+
 	}
 }