changeset 143:6cd44e0b522d

activating the listeners
author Frank Benoit <benoit@tionex.de>
date Wed, 23 Jan 2008 00:41:01 +0100
parents 62d278f4c20b
children 424cc4e14124
files dsss.conf dwt/events/PaintEvent.d dwt/events/TypedEvent.d dwtexamples/controlexample/Tab.d
diffstat 4 files changed, 30 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/dsss.conf	Tue Jan 22 01:29:57 2008 +0100
+++ b/dsss.conf	Wed Jan 23 00:41:01 2008 +0100
@@ -1,3 +1,5 @@
+
+
 [dwt]
 type=library
 
@@ -98,4 +100,3 @@
 buildflags+=-g -gc
 buildflags+=-Jdwtexamples/controlexample
 
-
--- a/dwt/events/PaintEvent.d	Tue Jan 22 01:29:57 2008 +0100
+++ b/dwt/events/PaintEvent.d	Wed Jan 23 00:41:01 2008 +0100
@@ -94,8 +94,13 @@
  */
 public char[] toString() {
     return Format( "{} gc={} x={} y={} width={} height={} count={}}",
-        super.toString[ 0 .. $-2 ],
-        gc, x, y, width, height, count );
+        super.toString[ 0 .. $-1 ],
+        gc is null ? "null" : gc.toString,
+        x,
+        y,
+        width,
+        height,
+        count );
 }
 }
 
--- a/dwt/events/TypedEvent.d	Tue Jan 22 01:29:57 2008 +0100
+++ b/dwt/events/TypedEvent.d	Wed Jan 23 00:41:01 2008 +0100
@@ -99,6 +99,8 @@
  * @return a string representation of the event
  */
 public char[] toString() {
-    return Format( "{}{{{} time={} data={}}", widget.toString(), time, data.toString() );
+    char[] str_widget = widget is null ? "null" : widget.toString;
+    char[] str_data   = data is null ? "null" : data.toString;
+    return Format( "{}{{time={} data={}}", str_widget, time, str_data );
 }
 }
--- a/dwtexamples/controlexample/Tab.d	Tue Jan 22 01:29:57 2008 +0100
+++ b/dwtexamples/controlexample/Tab.d	Wed Jan 23 00:41:01 2008 +0100
@@ -1443,10 +1443,10 @@
             if (EVENT_NAMES[i].id is event.type) break;
             i++;
         }
-        char[] toString = Format( "{} [{}]: ", EVENT_NAMES[i].name, event.type );
+        char[] str = Format( "{} [{}]: ", EVENT_NAMES[i].name, event.type );
         switch (event.type) {
             case DWT.KeyDown:
-            case DWT.KeyUp: toString ~= (new KeyEvent (event)).toString (); break;
+            case DWT.KeyUp: str ~= (new KeyEvent (event)).toString (); break;
             case DWT.MouseDown:
             case DWT.MouseUp:
             case DWT.MouseMove:
@@ -1454,37 +1454,37 @@
             case DWT.MouseExit:
             case DWT.MouseDoubleClick:
             case DWT.MouseWheel:
-            case DWT.MouseHover: toString ~= (new MouseEvent (event)).toString (); break;
-            case DWT.Paint: toString ~= (new PaintEvent (event)).toString (); break;
+            case DWT.MouseHover: str ~= (new MouseEvent (event)).toString (); break;
+            case DWT.Paint: str ~= (new PaintEvent (event)).toString (); break;
             case DWT.Move:
-            case DWT.Resize: toString ~= (new ControlEvent (event)).toString (); break;
-            case DWT.Dispose: toString ~= (new DisposeEvent (event)).toString (); break;
+            case DWT.Resize: str ~= (new ControlEvent (event)).toString (); break;
+            case DWT.Dispose: str ~= (new DisposeEvent (event)).toString (); break;
             case DWT.Selection:
-            case DWT.DefaultSelection: toString ~= (new SelectionEvent (event)).toString (); break;
+            case DWT.DefaultSelection: str ~= (new SelectionEvent (event)).toString (); break;
             case DWT.FocusIn:
-            case DWT.FocusOut: toString ~= (new FocusEvent (event)).toString (); break;
+            case DWT.FocusOut: str ~= (new FocusEvent (event)).toString (); break;
             case DWT.Expand:
-            case DWT.Collapse: toString ~= (new TreeEvent (event)).toString (); break;
+            case DWT.Collapse: str ~= (new TreeEvent (event)).toString (); break;
             case DWT.Iconify:
             case DWT.Deiconify:
             case DWT.Close:
             case DWT.Activate:
-            case DWT.Deactivate: toString ~=( new ShellEvent (event)).toString (); break;
+            case DWT.Deactivate: str ~=( new ShellEvent (event)).toString (); break;
             case DWT.Show:
-            case DWT.Hide: toString ~= ( null !is cast(Menu)event.widget) ? (new MenuEvent (event)).toString () : event.toString(); break;
-            case DWT.Modify: toString ~= (new ModifyEvent (event)).toString (); break;
-            case DWT.Verify: toString ~= (new VerifyEvent (event)).toString (); break;
-            case DWT.Help: toString ~= (new HelpEvent (event)).toString (); break;
-            case DWT.Arm: toString ~= (new ArmEvent (event)).toString (); break;
-            case DWT.Traverse: toString ~= (new TraverseEvent (event)).toString (); break;
+            case DWT.Hide: str ~= ( null !is cast(Menu)event.widget) ? (new MenuEvent (event)).toString () : event.toString(); break;
+            case DWT.Modify: str ~= (new ModifyEvent (event)).toString (); break;
+            case DWT.Verify: str ~= (new VerifyEvent (event)).toString (); break;
+            case DWT.Help: str ~= (new HelpEvent (event)).toString (); break;
+            case DWT.Arm: str ~= (new ArmEvent (event)).toString (); break;
+            case DWT.Traverse: str ~= (new TraverseEvent (event)).toString (); break;
             case DWT.HardKeyDown:
             case DWT.HardKeyUp:
             case DWT.DragDetect:
             case DWT.MenuDetect:
             case DWT.SetData:
-            default: toString ~= event.toString ();
+            default: str ~= event.toString ();
         }
-        eventConsole.append (toString);
+        eventConsole.append (str);
         eventConsole.append ("\n");
     }