Mercurial > projects > dwt-win
diff dwt/widgets/Group.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 | 25f88bf5a6df |
children | 36f5cb12e1a2 |
line wrap: on
line diff
--- a/dwt/widgets/Group.d Sat Apr 26 10:01:48 2008 +0200 +++ b/dwt/widgets/Group.d Mon May 05 00:12:38 2008 +0200 @@ -49,7 +49,7 @@ alias Composite.computeSize computeSize; alias Composite.windowProc windowProc; - char[] text = ""; + String text = ""; static const int CLIENT_INSET = 3; private static /+const+/ WNDPROC GroupProc; static if( OS.IsWinCE ){ @@ -187,7 +187,7 @@ * the work around must run all the time to stop the preferred * size from changing when a group is enabled and disabled. */ - char[] string = text; + String string = text; if ((style & DWT.RIGHT_TO_LEFT) !is 0) { if (OS.COMCTL32_MAJOR < 6 || !OS.IsAppThemed ()) { string = " " ~ string ~ " "; @@ -245,7 +245,7 @@ */ if ((style & DWT.RIGHT_TO_LEFT) !is 0) { if (OS.COMCTL32_MAJOR < 6 || !OS.IsAppThemed ()) { - char[] string = enabled || text.length is 0 ? text : " " ~ text ~ " "; + String string = enabled || text.length is 0 ? text : " " ~ text ~ " "; TCHAR* buffer = StrToTCHARz (/+getCodePage (),+/ string); OS.SetWindowText (handle, buffer); } @@ -271,7 +271,7 @@ return new Rectangle (x, y, width, height); } -override char[] getNameText () { +override String getNameText () { return getText (); } @@ -287,7 +287,7 @@ * <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; } @@ -339,7 +339,7 @@ * <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) error (DWT.ERROR_NULL_ARGUMENT); text = string; @@ -374,7 +374,7 @@ return super.widgetStyle () | OS.BS_GROUPBOX | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS; } -override char[] windowClass () { +override String windowClass () { return TCHARsToStr( GroupClass ); }