diff options
| author | Felipe Heidrich <Felipe_Heidrich@ca.ibm.com> | 2012-02-14 14:58:22 -0500 |
|---|---|---|
| committer | Felipe Heidrich <Felipe_Heidrich@ca.ibm.com> | 2012-02-14 14:58:22 -0500 |
| commit | bda61fcf4d94db1af2718e1a5f14c99c4ec12c81 (patch) | |
| tree | 83f3a7f0312a4f648cae27b20bc8656a0e63a6e9 /bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse | |
| parent | 75968627e6ab61e9dac8b042b74558e922f755b8 (diff) | |
| parent | 3a3b3eae51c5c9d2dc56f640836dc0c23db825a4 (diff) | |
| download | eclipse.platform.swt-bda61fcf4d94db1af2718e1a5f14c99c4ec12c81.tar.gz eclipse.platform.swt-bda61fcf4d94db1af2718e1a5f14c99c4ec12c81.tar.xz eclipse.platform.swt-bda61fcf4d94db1af2718e1a5f14c99c4ec12c81.zip | |
Merge branch 'master' into bug230854
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse')
3 files changed, 16 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java index 443e6ec81d..a9b2394616 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java @@ -2377,6 +2377,13 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { return result; } +LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) { + LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); + if (result != null) return result; + OS.InvalidateRect (handle, null, true); + return result; +} + LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java index 46023b78d4..d2bf5f051e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java @@ -337,7 +337,11 @@ public void setSelection (int value) { * <li>{@link SWT#ERROR}</li> * <li>{@link SWT#PAUSED}</li> * </ul> - * + * <p> + * Note: This operation is a hint and is not supported on + * platforms that do not have this concept. + * </p> + * * @param state the new state * * @exception SWTException <ul> diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java index 24a9fde70a..f7366cf6c1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java @@ -354,8 +354,10 @@ public void addSegmentListener (SegmentListener listener) { * <p> * <code>widgetSelected</code> is not called for texts. * <code>widgetDefaultSelected</code> is typically called when ENTER is pressed in a single-line text, - * or when ENTER is pressed in a search text. If the receiver has the <code>SWT.SEARCH | SWT.CANCEL</code> style - * and the user cancels the search, the event object detail field contains the value <code>SWT.CANCEL</code>. + * or when ENTER is pressed in a search text. If the receiver has the <code>SWT.SEARCH | SWT.ICON_CANCEL</code> style + * and the user cancels the search, the event object detail field contains the value <code>SWT.ICON_CANCEL</code>. + * Likewise, if the receiver has the <code>SWT.ICON_SEARCH</code> style and the icon search is selected, the + * event object detail field contains the value <code>SWT.ICON_SEARCH</code>. * </p> * * @param listener the listener which should be notified when the control is selected by the user |