projects/dwt-win: dwt/custom/CCombo.d comparison

comparison dwt/custom/CCombo.d @ 212:ab60f3309436

reverted the char[] to String and use the an alias.

author	Frank Benoit <benoit@tionex.de>
date	Mon, 05 May 2008 00:12:38 +0200
parents	3afcd4ddcf90
children	36f5cb12e1a2

comparison

equal deleted inserted replaced

-:ff59aeb96cac
+:ab60f3309436
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 *
 * @see #add(String,int)
 */
-public void add (char[] string) {
+public void add (String string) {
 checkWidget();
 if (string is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 list.add (string);
 }
 /**
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 *
 * @see #add(String)
 */
-public void add (char[] string, int index) {
+public void add (String string, int index) {
 checkWidget();
 if (string is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 list.add (string, index);
 }
 /**
 }
 public override Point computeSize (int wHint, int hHint, bool changed) {
 checkWidget ();
 int width = 0, height = 0;
-char[][] items = list.getItems ();
+String[] items = list.getItems ();
 GC gc = new GC (text);
 int spacer = gc.stringExtent (" ").x; //$NON-NLS-1$
 int textWidth = gc.stringExtent (text.getText ()).x;
 for (int i = 0; i < items.length; i++) {
 textWidth = Math.max (gc.stringExtent (items[i]).x, textWidth);
 */
 public void copy () {
 checkWidget ();
 text.copy ();
 }
-void createPopup(char[][] items, int selectionIndex) {
+void createPopup(String[] items, int selectionIndex) {
 // create shell and list
 popup = new Shell (getShell (), DWT.NO_TRIM | DWT.ON_TOP);
 int style = getStyle ();
 int listStyle = DWT.SINGLE | DWT.V_SCROLL;
 if ((style & DWT.FLAT) !is 0) listStyle |= DWT.FLAT;
 }
 return;
 }
 if (getShell() !is popup.getParent ()) {
-char[][] items = list.getItems ();
+String[] items = list.getItems ();
 int selectionIndex = list.getSelectionIndex ();
 list.removeListener (DWT.Dispose, listener);
 popup.dispose();
 popup = null;
 list = null;
 /*
 * Return the lowercase of the first non-'&' character following
 * an '&' character in the given string. If there are no '&'
 * characters in the given string, return '\0'.
 */
-dchar _findMnemonic (char[] string) {
+dchar _findMnemonic (String string) {
 if (string is null) return '\0';
 int index = 0;
 int length = string.length;
 do {
 while (index < length && string[index] !is '&') index++;
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public char[] getItem (int index) {
+public String getItem (int index) {
 checkWidget();
 return list.getItem (index);
 }
 /**
 * Returns the number of items contained in the receiver's list.
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public char[] [] getItems () {
+public String [] getItems () {
 checkWidget ();
 return list.getItems ();
 }
 public override Menu getMenu() {
 return text.getMenu();
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public char[] getText () {
+public String getText () {
 checkWidget ();
 return text.getText ();
 }
 /**
 * Returns the height of the receivers's text field.
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public int indexOf (char[] string) {
+public int indexOf (String string) {
 checkWidget ();
 if (string is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 return list.indexOf (string);
 }
 /**
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public int indexOf (char[] string, int start) {
+public int indexOf (String string, int start) {
 checkWidget ();
 if (string is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 return list.indexOf (string, start);
 }
 void initAccessible() {
 AccessibleAdapter accessibleAdapter = new class() AccessibleAdapter {
 public void getName (AccessibleEvent e) {
-char[] name = null;
+String name = null;
 Label label = getAssociatedLabel ();
 if (label !is null) {
 name = stripMnemonic (label.getText());
 }
 e.result = name;
 }
 public void getKeyboardShortcut(AccessibleEvent e) {
-char[] shortcut = null;
+String shortcut = null;
 Label label = getAssociatedLabel ();
 if (label !is null) {
-char[] text = label.getText ();
+String text = label.getText ();
 if (text !is null) {
 dchar mnemonic = _findMnemonic (text);
 if (mnemonic !is '\0') {
 shortcut = tango.text.convert.Format.Format( "Alt+{}", mnemonic ); //$NON-NLS-1$
 }
 }
 void listEvent (Event event) {
 switch (event.type) {
 case DWT.Dispose:
 if (getShell () !is popup.getParent ()) {
-char[][] items = list.getItems ();
+String[] items = list.getItems ();
 int selectionIndex = list.getSelectionIndex ();
 popup = null;
 list = null;
 createPopup (items, selectionIndex);
 }
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public void remove (char[] string) {
+public void remove (String string) {
 checkWidget();
 if (string is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 list.remove (string);
 }
 /**
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public void setItem (int index, char[] string) {
+public void setItem (int index, String string) {
 checkWidget();
 list.setItem (index, string);
 }
 /**
 * Sets the receiver's list to be the given array of items.
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public void setItems (char[] [] items) {
+public void setItems (String [] items) {
 checkWidget ();
 list.setItems (items);
 if (!text.getEditable ()) text.setText (""); //$NON-NLS-1$
 }
 /**
 * @exception DWTException <ul>
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
-public void setText (char[] string) {
+public void setText (String string) {
 checkWidget();
 if (string is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 int index = list.indexOf (string);
 if (index is -1) {
 list.deselectAll ();
 public void setTextLimit (int limit) {
 checkWidget();
 text.setTextLimit (limit);
 }
-public override void setToolTipText (char[] string) {
+public override void setToolTipText (String string) {
 checkWidget();
 super.setToolTipText(string);
 arrow.setToolTipText (string);
 text.setToolTipText (string);
 }
 public void setVisibleItemCount (int count) {
 checkWidget ();
 if (count < 0) return;
 visibleItemCount = count;
 }
-char[] stripMnemonic (char[] string) {
+String stripMnemonic (String string) {
 int index = 0;
 int length_ = string.length;
 do {
 while ((index < length_) && (string[index] !is '&')) index++;
 if (++index >= length_) return string;

Mercurial > projects > dwt-win

comparison dwt/custom/CCombo.d @ 212:ab60f3309436