diff dwt/widgets/Widget.d @ 238:380bad9f6852

reverted char[] to String
author Frank Benoit <benoit@tionex.de>
date Mon, 05 May 2008 00:42:55 +0200
parents 285aa0c31277
children ce446666f5a2
line wrap: on
line diff
--- a/dwt/widgets/Widget.d	Sat Apr 26 10:01:30 2008 +0200
+++ b/dwt/widgets/Widget.d	Mon May 05 00:42:55 2008 +0200
@@ -179,8 +179,8 @@
     static const int MONTH_CHANGED = 61;
     static const int LAST_SIGNAL = 62;
 
-    template UD_Getter( char[] name ){
-        const char[] UD_Getter = "void* ud"~name~"(){ return getDisplay().getWindowProcUserData( "~name~"); }\n";
+    template UD_Getter( String name ){
+        const String UD_Getter = "void* ud"~name~"(){ return getDisplay().getWindowProcUserData( "~name~"); }\n";
     }
 
     mixin ( UD_Getter!( "ACTIVATE" ));
@@ -578,13 +578,13 @@
  *
  * @see #setData(String, Object)
  */
-public Object getData (char[] key) {
+public Object getData (String key) {
     checkWidget();
     if (key is null) error (DWT.ERROR_NULL_ARGUMENT);
     if ((state & KEYED_DATA) !is 0) {
         Object[] table = (cast(ArrayWrapperObject) data).array;
         for (int i=1; i<table.length; i+=2) {
-            char[] tablekey = (cast(ArrayWrapperString) table[i]).array;
+            String tablekey = (cast(ArrayWrapperString) table[i]).array;
             if (key ==/*eq*/ tablekey ) return table [i+1];
         }
     }
@@ -612,17 +612,17 @@
     return display;
 }
 
-char[] getName () {
-//  char[] str = getClass ().getName ();
+String getName () {
+//  String str = getClass ().getName ();
 //  int index = str.lastIndexOf ('.');
 //  if (index is -1) return str;
-    char[] str = this.classinfo.name;
+    String str = this.classinfo.name;
     int index = str.length;
     while ((--index > 0) && (str[index] !is '.')) {}
     return str[index + 1 .. $ ];
 }
 
-char[] getNameText () {
+String getNameText () {
     return "";
 }
 
@@ -909,9 +909,9 @@
     return 0;
 }
 
-char [] fixMnemonic (char[] str) {
+char [] fixMnemonic (String str) {
     int len = str.length;
-    char[] text = str[0 .. len].dup;
+    String text = str[0 .. len].dup;
     int i = 0, j = 0;
     char [] result = new char [len * 2];
     while (i < len) {
@@ -1379,7 +1379,7 @@
  *
  * @see #getData(String)
  */
-public void setData (char[] key, Object value) {
+public void setData (String key, Object value) {
     checkWidget();
     if (key.length is 0) error (DWT.ERROR_NULL_ARGUMENT);
     int index = 1;
@@ -1387,7 +1387,7 @@
     if ((state & KEYED_DATA) !is 0) {
         table = (cast(ArrayWrapperObject) data).array;
         while (index < table.length) {
-            char[] tablekey = (cast(ArrayWrapperString)table[index]).array;
+            String tablekey = (cast(ArrayWrapperString)table[index]).array;
             if (key ==/*eq*/ tablekey ) break;
             index += 2;
         }
@@ -1527,8 +1527,8 @@
  *
  * @return a string representation of the receiver
  */
-public override char[] toString () {
-    char[] str = "*Disposed*";
+public override String toString () {
+    String str = "*Disposed*";
     if (!isDisposed ()) {
         str = "*Wrong Thread*";
         if (isValidThread ()) str = getNameText ();
@@ -1558,7 +1558,7 @@
 }
 
 int /*long*/ windowProc (GtkWidget* handle, int /*long*/ user_data) {
-    void trace( char[] str ){
+    void trace( String str ){
         version(LOG) Stderr.formatln( "Widget windowProc {}", str ).flush;
     }
 
@@ -1621,7 +1621,7 @@
 }
 
 int /*long*/ windowProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ user_data) {
-    void trace( char[] str ){
+    void trace( String str ){
         version(LOG) Stderr.formatln( "Widget windowProc1 {}", str ).flush;
     }
 
@@ -1731,7 +1731,7 @@
 }
 
 int /*long*/ windowProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
-    void trace( char[] str ){
+    void trace( String str ){
         version(LOG) Stderr.formatln( "Widget windowProc2 {}", str ).flush;
     }
 
@@ -1765,7 +1765,7 @@
 }
 
 int /*long*/ windowProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
-    void trace( char[] str ){
+    void trace( String str ){
         version(LOG) Stderr.formatln( "Widget windowProc3 {}", str ).flush;
     }