Mercurial > projects > dwt-win
comparison dwt/custom/CCombo.d @ 320:da968414c383
Merge changes SWT 3.4.1
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Mon, 03 Nov 2008 21:58:40 +0100 |
parents | 349b8c12e243 |
children |
comparison
equal
deleted
inserted
replaced
319:71b78d56f01f | 320:da968414c383 |
---|---|
530 checkWidget (); | 530 checkWidget (); |
531 text.setText(""); //$NON-NLS-1$ | 531 text.setText(""); //$NON-NLS-1$ |
532 list.deselectAll (); | 532 list.deselectAll (); |
533 } | 533 } |
534 void dropDown (bool drop) { | 534 void dropDown (bool drop) { |
535 if (drop is isDropped () || !isVisible()) return; | 535 if (drop is isDropped ()) return; |
536 if (!drop) { | 536 if (!drop) { |
537 popup.setVisible (false); | 537 popup.setVisible (false); |
538 if (!isDisposed () && isFocusControl()) { | 538 if (!isDisposed () && isFocusControl()) { |
539 text.setFocus(); | 539 text.setFocus(); |
540 } | 540 } |
541 return; | 541 return; |
542 } | 542 } |
543 | 543 if (!isVisible()) return; |
544 if (getShell() !is popup.getParent ()) { | 544 if (getShell() !is popup.getParent ()) { |
545 String[] items = list.getItems (); | 545 String[] items = list.getItems (); |
546 int selectionIndex = list.getSelectionIndex (); | 546 int selectionIndex = list.getSelectionIndex (); |
547 list.removeListener (DWT.Dispose, listener); | 547 list.removeListener (DWT.Dispose, listener); |
548 popup.dispose(); | 548 popup.dispose(); |