Attachment #184393 for bug #118659

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 118659
Collapse All | Expand All

Lines 201-209 Link Here

(-)Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
201	}	201	}
202	} else {	202	} else {
203	size = minimumSize (wHint, hHint, changed);	203	size = minimumSize (wHint, hHint, changed);
		204	if (size.x == 0) size.x = DEFAULT_WIDTH;
		205	if (size.y == 0) size.y = DEFAULT_HEIGHT;
204	}	206	}
205	if (size.x == 0) size.x = DEFAULT_WIDTH;
206	if (size.y == 0) size.y = DEFAULT_HEIGHT;
207	if (wHint != SWT.DEFAULT) size.x = wHint;	207	if (wHint != SWT.DEFAULT) size.x = wHint;
208	if (hHint != SWT.DEFAULT) size.y = hHint;	208	if (hHint != SWT.DEFAULT) size.y = hHint;
209	Rectangle trim = computeTrim (0, 0, size.x, size.y);	209	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Lines 240-248 Link Here

(-)Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
240	}	240	}
241	} else {	241	} else {
242	size = minimumSize (wHint, hHint, changed);	242	size = minimumSize (wHint, hHint, changed);
		243	if (size.x == 0) size.x = DEFAULT_WIDTH;
		244	if (size.y == 0) size.y = DEFAULT_HEIGHT;
243	}	245	}
244	if (size.x == 0) size.x = DEFAULT_WIDTH;
245	if (size.y == 0) size.y = DEFAULT_HEIGHT;
246	if (wHint != SWT.DEFAULT) size.x = wHint;	246	if (wHint != SWT.DEFAULT) size.x = wHint;
247	if (hHint != SWT.DEFAULT) size.y = hHint;	247	if (hHint != SWT.DEFAULT) size.y = hHint;
248	Rectangle trim = computeTrim (0, 0, size.x, size.y);	248	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Lines 224-232 Link Here

(-)Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
224	}	224	}
225	} else {	225	} else {
226	size = minimumSize (wHint, hHint, changed);	226	size = minimumSize (wHint, hHint, changed);
		227	if (size.x == 0) size.x = DEFAULT_WIDTH;
		228	if (size.y == 0) size.y = DEFAULT_HEIGHT;
227	}	229	}
228	if (size.x == 0) size.x = DEFAULT_WIDTH;
229	if (size.y == 0) size.y = DEFAULT_HEIGHT;
230	if (wHint != SWT.DEFAULT) size.x = wHint;	230	if (wHint != SWT.DEFAULT) size.x = wHint;
231	if (hHint != SWT.DEFAULT) size.y = hHint;	231	if (hHint != SWT.DEFAULT) size.y = hHint;
232	Rectangle trim = computeTrim (0, 0, size.x, size.y);	232	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Lines 157-165 Link Here

(-)Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
157	}	157	}
158	} else {	158	} else {
159	size = minimumSize (wHint, hHint, changed);	159	size = minimumSize (wHint, hHint, changed);
		160	if (size.x == 0) size.x = DEFAULT_WIDTH;
		161	if (size.y == 0) size.y = DEFAULT_HEIGHT;
160	}	162	}
161	if (size.x == 0) size.x = DEFAULT_WIDTH;
162	if (size.y == 0) size.y = DEFAULT_HEIGHT;
163	if (wHint != SWT.DEFAULT) size.x = wHint;	163	if (wHint != SWT.DEFAULT) size.x = wHint;
164	if (hHint != SWT.DEFAULT) size.y = hHint;	164	if (hHint != SWT.DEFAULT) size.y = hHint;
165	Rectangle trim = computeTrim (0, 0, size.x, size.y);	165	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Lines 223-231 Link Here

(-)Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
223	}	223	}
224	} else {	224	} else {
225	size = minimumSize ();	225	size = minimumSize ();
		226	if (size.x == 0) size.x = DEFAULT_WIDTH;
		227	if (size.y == 0) size.y = DEFAULT_HEIGHT;
226	}	228	}
227	if (size.x == 0) size.x = DEFAULT_WIDTH;
228	if (size.y == 0) size.y = DEFAULT_HEIGHT;
229	if (wHint != SWT.DEFAULT) size.x = wHint;	229	if (wHint != SWT.DEFAULT) size.x = wHint;
230	if (hHint != SWT.DEFAULT) size.y = hHint;	230	if (hHint != SWT.DEFAULT) size.y = hHint;
231	Rectangle trim = computeTrim (0, 0, size.x, size.y);	231	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Lines 236-244 Link Here

(-)Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
236	}	236	}
237	} else {	237	} else {
238	size = minimumSize (wHint, hHint, changed);	238	size = minimumSize (wHint, hHint, changed);
		239	if (size.x == 0) size.x = DEFAULT_WIDTH;
		240	if (size.y == 0) size.y = DEFAULT_HEIGHT;
239	}	241	}
240	if (size.x == 0) size.x = DEFAULT_WIDTH;
241	if (size.y == 0) size.y = DEFAULT_HEIGHT;
242	if (wHint != SWT.DEFAULT) size.x = wHint;	242	if (wHint != SWT.DEFAULT) size.x = wHint;
243	if (hHint != SWT.DEFAULT) size.y = hHint;	243	if (hHint != SWT.DEFAULT) size.y = hHint;
244	Rectangle trim = computeTrim (0, 0, size.x, size.y);	244	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Lines 255-263 Link Here

(-)Eclipse SWT/wpf/org/eclipse/swt/widgets/Composite.java (-2 / +2 lines)
255	}	255	}
256	} else {	256	} else {
257	size = minimumSize (wHint, hHint, changed);	257	size = minimumSize (wHint, hHint, changed);
		258	if (size.x == 0) size.x = DEFAULT_WIDTH;
		259	if (size.y == 0) size.y = DEFAULT_HEIGHT;
258	}	260	}
259	if (size.x == 0) size.x = DEFAULT_WIDTH;
260	if (size.y == 0) size.y = DEFAULT_HEIGHT;
261	if (wHint != SWT.DEFAULT) size.x = wHint;	261	if (wHint != SWT.DEFAULT) size.x = wHint;
262	if (hHint != SWT.DEFAULT) size.y = hHint;	262	if (hHint != SWT.DEFAULT) size.y = hHint;
263	Rectangle trim = computeTrim (0, 0, size.x, size.y);	263	Rectangle trim = computeTrim (0, 0, size.x, size.y);

Return to bug 118659