Changeset 212:ab60f3309436 for dwt/graphics/FontData.d
- Timestamp:
- 05/04/08 18:12:38 (7 months ago)
- Files:
-
- dwt/graphics/FontData.d (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
dwt/graphics/FontData.d
r204 r212 76 76 * The locales of the font 77 77 */ 78 char[]lang, country, variant;78 String lang, country, variant; 79 79 80 80 private static FontData s_this; … … 121 121 * @see #toString 122 122 */ 123 public this( char[]string) {123 public this(String string) { 124 124 if (string is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 125 125 int start = 0; 126 126 int end = string.indexOf('|'); 127 127 if (end is -1) DWT.error(DWT.ERROR_INVALID_ARGUMENT); 128 char[]version1 = string.substring(start, end);128 String version1 = string.substring(start, end); 129 129 try { 130 130 if (Integer.parseInt(version1) !is 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT); … … 136 136 end = string.indexOf('|', start); 137 137 if (end is -1) DWT.error(DWT.ERROR_INVALID_ARGUMENT); 138 char[]name = string.substring(start, end);138 String name = string.substring(start, end); 139 139 140 140 start = end + 1; … … 166 166 setStyle(style); 167 167 if (end is -1) return; 168 char[]platform = string.substring(start, end);168 String platform = string.substring(start, end); 169 169 170 170 start = end + 1; 171 171 end = string.indexOf('|', start); 172 172 if (end is -1) return; 173 char[]version2 = string.substring(start, end);173 String version2 = string.substring(start, end); 174 174 175 175 if (platform ==/*eq*/ "WINDOWS" && version2 ==/*eq*/ "1") { //$NON-NLS-1$//$NON-NLS-2$ … … 235 235 return; 236 236 } 237 char[]buffer = string.substring(start);237 String buffer = string.substring(start); 238 238 auto wname = StrToTCHARs(buffer); 239 239 int len = Math.min(OS.LF_FACESIZE - 1, wname.length); … … 258 258 * </ul> 259 259 */ 260 public this( char[]name, int height, int style) {260 public this(String name, int height, int style) { 261 261 if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 262 262 setName(name); … … 269 269 } 270 270 271 /*public*/ this( char[]name, float height, int style) {271 /*public*/ this(String name, float height, int style) { 272 272 if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 273 273 setName(name); … … 323 323 /* Get the locale ID */ 324 324 int length_ = 8; 325 char[]str = .TCHARzToStr( cast(TCHAR*)lpLocaleString, length_);325 String str = .TCHARzToStr( cast(TCHAR*)lpLocaleString, length_); 326 326 int lcid = Integer.parseInt(str, 16); 327 327 … … 381 381 * @since 3.0 382 382 */ 383 public char[]getLocale () {383 public String getLocale () { 384 384 StringBuffer buffer = new StringBuffer (); 385 385 char sep = '_'; … … 396 396 } 397 397 398 char[]result = buffer.toString ();398 String result = buffer.toString (); 399 399 int length_ = result.length; 400 400 if (length_ > 0) { … … 415 415 * @see #setName 416 416 */ 417 public char[]getName() {417 public String getName() { 418 418 return .TCHARzToStr( data.lfFaceName.ptr, -1 ); 419 419 } … … 446 446 */ 447 447 override public hash_t toHash () { 448 char[]name = getName();448 String name = getName(); 449 449 return data.lfCharSet ^ getHeight() ^ data.lfWidth ^ data.lfEscapement ^ 450 450 data.lfOrientation ^ data.lfWeight ^ data.lfItalic ^data.lfUnderline ^ 451 451 data.lfStrikeOut ^ data.lfCharSet ^ data.lfOutPrecision ^ 452 452 data.lfClipPrecision ^ data.lfQuality ^ data.lfPitchAndFamily ^ 453 typeid( char[]).getHash(&name);453 typeid(String).getHash(&name); 454 454 } 455 455 … … 494 494 * @see java.util.Locale#toString 495 495 */ 496 public void setLocale( char[]locale) {496 public void setLocale(String locale) { 497 497 lang = country = variant = null; 498 498 if (locale !is null) { … … 548 548 * @see #getName 549 549 */ 550 public void setName( char[]name) {550 public void setName(String name) { 551 551 if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 552 552 … … 590 590 * @see FontData 591 591 */ 592 override public char[]toString() {592 override public String toString() { 593 593 StringBuffer buffer = new StringBuffer(); 594 594 buffer.append("1|"); //$NON-NLS-1$ 595 595 buffer.append(getName()); 596 596 buffer.append("|"); //$NON-NLS-1$ 597 buffer.append(to!( char[])(getHeightF()));598 buffer.append("|"); //$NON-NLS-1$ 599 buffer.append(to!( char[])(getStyle()));597 buffer.append(to!(String)(getHeightF())); 598 buffer.append("|"); //$NON-NLS-1$ 599 buffer.append(to!(String)(getStyle())); 600 600 buffer.append("|"); //$NON-NLS-1$ 601 601 buffer.append("WINDOWS|1|"); //$NON-NLS-1$ 602 buffer.append(to!( char[])(data.lfHeight));603 buffer.append("|"); //$NON-NLS-1$ 604 buffer.append(to!( char[])(data.lfWidth));605 buffer.append("|"); //$NON-NLS-1$ 606 buffer.append(to!( char[])(data.lfEscapement));607 buffer.append("|"); //$NON-NLS-1$ 608 buffer.append(to!( char[])(data.lfOrientation));609 buffer.append("|"); //$NON-NLS-1$ 610 buffer.append(to!( char[])(data.lfWeight));611 buffer.append("|"); //$NON-NLS-1$ 612 buffer.append(to!( char[])(data.lfItalic));613 buffer.append("|"); //$NON-NLS-1$ 614 buffer.append(to!( char[])(data.lfUnderline));615 buffer.append("|"); //$NON-NLS-1$ 616 buffer.append(to!( char[])(data.lfStrikeOut));617 buffer.append("|"); //$NON-NLS-1$ 618 buffer.append(to!( char[])(data.lfCharSet));619 buffer.append("|"); //$NON-NLS-1$ 620 buffer.append(to!( char[])(data.lfOutPrecision));621 buffer.append("|"); //$NON-NLS-1$ 622 buffer.append(to!( char[])(data.lfClipPrecision));623 buffer.append("|"); //$NON-NLS-1$ 624 buffer.append(to!( char[])(data.lfQuality));625 buffer.append("|"); //$NON-NLS-1$ 626 buffer.append(to!( char[])(data.lfPitchAndFamily));602 buffer.append(to!(String)(data.lfHeight)); 603 buffer.append("|"); //$NON-NLS-1$ 604 buffer.append(to!(String)(data.lfWidth)); 605 buffer.append("|"); //$NON-NLS-1$ 606 buffer.append(to!(String)(data.lfEscapement)); 607 buffer.append("|"); //$NON-NLS-1$ 608 buffer.append(to!(String)(data.lfOrientation)); 609 buffer.append("|"); //$NON-NLS-1$ 610 buffer.append(to!(String)(data.lfWeight)); 611 buffer.append("|"); //$NON-NLS-1$ 612 buffer.append(to!(String)(data.lfItalic)); 613 buffer.append("|"); //$NON-NLS-1$ 614 buffer.append(to!(String)(data.lfUnderline)); 615 buffer.append("|"); //$NON-NLS-1$ 616 buffer.append(to!(String)(data.lfStrikeOut)); 617 buffer.append("|"); //$NON-NLS-1$ 618 buffer.append(to!(String)(data.lfCharSet)); 619 buffer.append("|"); //$NON-NLS-1$ 620 buffer.append(to!(String)(data.lfOutPrecision)); 621 buffer.append("|"); //$NON-NLS-1$ 622 buffer.append(to!(String)(data.lfClipPrecision)); 623 buffer.append("|"); //$NON-NLS-1$ 624 buffer.append(to!(String)(data.lfQuality)); 625 buffer.append("|"); //$NON-NLS-1$ 626 buffer.append(to!(String)(data.lfPitchAndFamily)); 627 627 buffer.append("|"); //$NON-NLS-1$ 628 628 buffer.append(getName());