Changeset 187:bcdc37794717

Timestamp:

03/10/08 12:08:22 (9 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Reverted changes from previous wrong reverting changes:
See: -r026ce3b05f57, -r4d06074bb1af, -rc4643827733c

Files:

• dwt/dwthelper/utils.d (modified) (2 diffs)
• dwt/layout/FormAttachment.d (modified) (4 diffs)
• dwt/widgets/Label.d (modified) (1 diff)

dwt/dwthelper/utils.d

@@ -46 +46 @@
-alias ValueWrapperT!(bool)    ValueWrapperBool;
-alias ValueWrapperT!(int)     ValueWrapperInt;
+alias ValueWrapperT!(long)    ValueWrapperLong;
-alias ArrayWrapperT!(byte)    ArrayWrapperByte;
-alias ArrayWrapperT!(int)     ArrayWrapperInt;
@@ -321 +322 @@
-}
-
+public char* toStringzValidPtr( char[] src ){
+    if( src ){
+        return src.toStringz();
+    }
+    else{
+        static const char[] nullPtr = "\0";
+        return nullPtr.ptr;
+    }
+}
+
-static char[] toHex(uint value, bool prefix = true, int radix = 8){
-    return tango.text.convert.Integer.toString(

dwt/layout/FormAttachment.d

@@ -186 +186 @@
- */
-public this (int numerator, int denominator, int offset) {
-==
+is
-    this.numerator = numerator;
-    this.denominator = denominator;
@@ -245 +245 @@
-        n = temp;
-    }
-=
+is
-        temp = m;
-        m = n;
@@ -284 +284 @@
-
-int solveX (int value) {
-==
+is
-    return ((numerator * value) / denominator) + offset;
-}
-
-int solveY (int value) {
-==
+is
-    return (value - offset) * denominator / numerator;
-}
@@ -299 +299 @@
- * @return a string representation of the FormAttachment
- */
-override public
-=
+public override
+is
-    return Format("{{y = ({})x + {}}", string, ( offset >= 0 ? Format(")x + {}", offset ) : Format( ")x - {}", -offset)));
-}

dwt/widgets/Label.d

@@ -396 +396 @@
-    checkWidget ();
-    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
-
+
+
-    /*
-    * Feature in Windows.  For some reason, SetWindowText() for