Changeset 241:b4846fd3437a

Timestamp:

06/22/08 19:45:58 (7 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

work on allow null strings and arrays

Files:

• dwt/widgets/Group.d (modified) (2 diffs)
• dwt/widgets/Item.d (modified) (2 diffs)
• dwt/widgets/Label.d (modified) (2 diffs)
• dwt/widgets/Link.d (modified) (2 diffs)
• dwt/widgets/List.d (modified) (23 diffs)

dwt/widgets/Group.d

@@ -346 +346 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -356 +353 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    text = string;
-    /*

dwt/widgets/Item.d

@@ -172 +172 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -182 +179 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    text = string;
-}

dwt/widgets/Label.d

@@ -392 +392 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -402 +399 @@
-public void setText (String string) {
-    checkWidget ();
-    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
-    // DWT extensions allow null argument
-
+
+
-    /*
-    * Feature in Windows.  For some reason, SetWindowText() for

dwt/widgets/Link.d

@@ -671 +671 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -681 +678 @@
-public void setText (String string) {
-    checkWidget ();
-
-
+
+
+
-    text = string;
-    if (OS.COMCTL32_MAJOR >= 6) {

dwt/widgets/List.d

@@ -109 +109 @@
- * @param string the new item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -121 +118 @@
-public void add (String string) {
-    checkWidget ();
-
+
+
-    TCHAR* buffer = StrToTCHARz ( getCodePage (), string);
-    int result = OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer);
@@ -141 +139 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>
- * </ul>
@@ -153 +150 @@
-public void add (String string, int index) {
-    checkWidget ();
-
+
+
-    if (index is -1) error (DWT.ERROR_INVALID_RANGE);
-    TCHAR* buffer = StrToTCHARz(getCodePage (), string);
@@ -300 +298 @@
- * @param indices the array of indices for the items to deselect
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the set of indices is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -310 +305 @@
-public void deselect (int [] indices) {
-    checkWidget ();
-
+
+
-    if (indices.length is 0) return;
-    if ((style & DWT.SINGLE) !is 0) {
@@ -657 +653 @@
- * @return the index of the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -680 +673 @@
- * @return the index of the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -690 +680 @@
-public int indexOf (String string, int start) {
-    checkWidget ();
-
+
+
-
-    /*
@@ -745 +736 @@
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- *    <li>ERROR_NULL_ARGUMENT - if the indices array is null</li>
- * </ul>
- * @exception DWTException <ul>
@@ -754 +744 @@
-public void remove (int [] indices) {
-    checkWidget ();
-
+
+
-    if (indices.length is 0) return;
-    int [] newIndices = new int [indices.length];
@@ -935 +926 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>
- * </ul>
@@ -945 +935 @@
-public void remove (String string) {
-    checkWidget ();
-
+
+
-    int index = indexOf (string, 0);
-    if (index is -1) error (DWT.ERROR_INVALID_ARGUMENT);
@@ -1004 +995 @@
- * @param indices the array of indices for the items to select
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of indices is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1016 +1004 @@
-public void select (int [] indices) {
-    checkWidget ();
-
+
+
-    int length = indices.length;
-    if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) return;
@@ -1188 +1177 @@
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
@@ -1197 +1185 @@
-public void setItem (int index, String string) {
-    checkWidget ();
-
+
+
-    int topIndex = getTopIndex ();
-    bool isSelected = isSelected (index);
@@ -1212 +1201 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if an item in the items array is null</li>
- * </ul>
@@ -1222 +1210 @@
-public void setItems (String [] items) {
-    checkWidget ();
-
-
-
-
+
+
+
+
+
+
-    int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
-    OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, cast(LONG_PTR) ListProc);
@@ -1343 +1333 @@
- * @param indices the indices of the items to select
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of indices is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1356 +1343 @@
-public void setSelection(int [] indices) {
-    checkWidget ();
-
+
+
-    deselectAll ();
-    int length = indices.length;
@@ -1377 +1365 @@
- * @param items the array of items
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of items is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1391 +1376 @@
-public void setSelection (String [] items) {
-    checkWidget ();
-
+
+
-    deselectAll ();
-    int length = items.length;