Mercurial > projects > dwt-mac
diff dwt/widgets/Text.d @ 7:e831403a80a9
Add 'cast' to casts
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Wed, 27 Aug 2008 14:30:35 +0200 |
parents | 1a8b3cb347e0 |
children | d8635bb48c7c |
line wrap: on
line diff
--- a/dwt/widgets/Text.d Wed Aug 27 14:10:03 2008 +0200 +++ b/dwt/widgets/Text.d Wed Aug 27 14:30:35 2008 +0200 @@ -251,9 +251,9 @@ } NSString str = NSString.stringWith(string); if ((style & DWT.SINGLE) !is 0) { -// new NSTextFieldCell(((NSTextField)view).cell()).title(). +// new NSTextFieldCell((cast(NSTextField)view).cell()).title(). } else { - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSMutableString mutableString = widget.textStorage().mutableString(); mutableString.appendString(str); NSRange range = new NSRange(); @@ -301,21 +301,21 @@ checkWidget(); int width = 0, height = 0; if ((style & DWT.SINGLE) !is 0) { - NSTextField widget = (NSTextField)view; + NSTextField widget = cast(NSTextField)view; NSRect oldRect = widget.frame(); widget.sizeToFit(); NSRect newRect = widget.frame(); widget.setFrame (oldRect); - width = (int)newRect.width; - height = (int)newRect.height; + width = cast(int)newRect.width; + height = cast(int)newRect.height; } else { - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSRect oldRect = widget.frame(); widget.sizeToFit(); NSRect newRect = widget.frame(); widget.setFrame (oldRect); - width = (int)newRect.width; - height = (int)newRect.height; + width = cast(int)newRect.width; + height = cast(int)newRect.height; } if (width <= 0) width = DEFAULT_WIDTH; if (height <= 0) height = DEFAULT_HEIGHT; @@ -343,7 +343,7 @@ if ((style & DWT.SINGLE) !is 0) { } else { - ((NSTextView)view).copy(); + (cast(NSTextView)view).copy(); } } @@ -351,11 +351,11 @@ if ((style & DWT.SINGLE) !is 0) { NSTextField widget; if ((style & DWT.PASSWORD) !is 0) { - widget = (NSTextField)new NSSecureTextField().alloc(); + widget = cast(NSTextField)new NSSecureTextField().alloc(); } else if ((style & DWT.SEARCH) !is 0) { - widget = (NSTextField)new NSSearchField().alloc(); + widget = cast(NSTextField)new NSSearchField().alloc(); } else { - widget = (NSTextField)new SWTTextField().alloc(); + widget = cast(NSTextField)new SWTTextField().alloc(); } widget.initWithFrame(new NSRect()); widget.setSelectable(true); @@ -371,14 +371,14 @@ view = widget; parent.contentView().addSubview_(widget); } else { - SWTScrollView scrollWidget = (SWTScrollView)new SWTScrollView().alloc(); + SWTScrollView scrollWidget = cast(SWTScrollView)new SWTScrollView().alloc(); scrollWidget.initWithFrame(new NSRect()); scrollWidget.setHasVerticalScroller((style & DWT.VERTICAL) !is 0); scrollWidget.setHasHorizontalScroller((style & DWT.HORIZONTAL) !is 0); scrollWidget.setAutoresizesSubviews(true); scrollWidget.setTag(jniRef); - SWTTextView widget = (SWTTextView)new SWTTextView().alloc(); + SWTTextView widget = cast(SWTTextView)new SWTTextView().alloc(); widget.initWithFrame(new NSRect()); widget.setEditable((style & DWT.READ_ONLY) is 0); if ((style & DWT.BORDER) is 0) widget.setFocusRingType(OS.NSFocusRingTypeNone); @@ -437,7 +437,7 @@ if ((style & DWT.SINGLE) !is 0) { } else { - ((NSTextView)view).cut(null); + (cast(NSTextView)view).cut(null); } // bool cut = true; // char [] oldText = null; @@ -543,7 +543,7 @@ return new Point (0, 0); } // NSText - NSRange range = ((NSTextView)view).selectedRange(); + NSRange range = (cast(NSTextView)view).selectedRange(); System.out.println(range.location + " " + range.length); return null; } @@ -567,7 +567,7 @@ //TODO return 0; } else { - NSRange range = ((NSTextView)view).selectedRange(); + NSRange range = (cast(NSTextView)view).selectedRange(); return range.location; } } @@ -585,7 +585,7 @@ public int getCharCount () { checkWidget (); if ((style & DWT.SINGLE) !is 0) { - return new NSCell(((NSControl)view).cell()).title().length(); + return new NSCell((cast(NSControl)view).cell()).title().length(); } else { //TODO return 0; @@ -662,7 +662,7 @@ public int getLineCount () { checkWidget(); if ((style & DWT.SINGLE) !is 0) return 1; - return ((NSTextView)view).textStorage().paragraphs().count(); + return (cast(NSTextView)view).textStorage().paragraphs().count(); } /** @@ -773,10 +773,10 @@ public Point getSelection () { checkWidget(); if ((style & DWT.SINGLE) !is 0) { -// new NSTextFieldCell(((NSTextField)view).cell()).title(). +// new NSTextFieldCell((cast(NSTextField)view).cell()).title(). return new Point(0, 0); } else { - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSRange range = widget.selectedRange(); return new Point(range.location, range.location + range.length); } @@ -795,10 +795,10 @@ public int getSelectionCount () { checkWidget(); if ((style & DWT.SINGLE) !is 0) { -// new NSTextFieldCell(((NSTextField)view).cell()).title(). +// new NSTextFieldCell((cast(NSTextField)view).cell()).title(). return -1; } else { - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSRange range = widget.selectedRange(); return range.length; } @@ -820,7 +820,7 @@ //TODO return ""; } else { - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSRange range = widget.selectedRange(); NSString str = widget.textStorage().string(); char[] buffer = new char[range.length]; @@ -867,9 +867,9 @@ checkWidget(); NSString str; if ((style & DWT.SINGLE) !is 0) { - str = new NSTextFieldCell(((NSTextField)view).cell()).title(); + str = new NSTextFieldCell((cast(NSTextField)view).cell()).title(); } else { - str = ((NSTextView)view).textStorage().string(); + str = (cast(NSTextView)view).textStorage().string(); } if (str is null) return ""; char[] buffer = new char[str.length()]; @@ -899,7 +899,7 @@ checkWidget (); NSString str; if ((style & DWT.SINGLE) !is 0) { - str = new NSTextFieldCell(((NSTextField)view).cell()).title(); + str = new NSTextFieldCell((cast(NSTextField)view).cell()).title(); } else { str = null; @@ -1004,11 +1004,11 @@ if (string is null) return; } if ((style & DWT.SINGLE) !is 0) { -// new NSTextFieldCell(((NSTextField)view).cell()).title(). +// new NSTextFieldCell((cast(NSTextField)view).cell()).title(). } else { // NSString str = NSString.stringWith(string); - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSRange range = widget.selectedRange(); widget.textStorage().replaceCharactersInRange_withString_(range, str); } @@ -1157,7 +1157,7 @@ if ((style & DWT.SINGLE) !is 0) { setSelection (0, getCharCount ()); } else { - ((NSTextView)view).selectAll(null); + (cast(NSTextView)view).selectAll(null); } } @@ -1231,9 +1231,9 @@ nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], 1); } if ((style & DWT.SINGLE) !is 0) { - ((NSTextField)view).setBackgroundColor(nsColor); + (cast(NSTextField)view).setBackgroundColor(nsColor); } else { - ((NSTextView)view).setBackgroundColor(nsColor); + (cast(NSTextView)view).setBackgroundColor(nsColor); } } @@ -1316,9 +1316,9 @@ style |= DWT.READ_ONLY; } if ((style & DWT.SINGLE) !is 0) { - ((NSTextField)view).setEditable(editable); + (cast(NSTextField)view).setEditable(editable); } else { - ((NSTextView)view).setEditable(editable); + (cast(NSTextView)view).setEditable(editable); } } @@ -1330,9 +1330,9 @@ nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], 1); } if ((style & DWT.SINGLE) !is 0) { - ((NSTextField)view).setTextColor(nsColor); + (cast(NSTextField)view).setTextColor(nsColor); } else { - ((NSTextView)view).setTextColor_(nsColor); + (cast(NSTextView)view).setTextColor_(nsColor); } } @@ -1451,8 +1451,8 @@ if ((style & DWT.SINGLE) !is 0) { // int length = getCharCount (); // ControlEditTextSelectionRec selection = new ControlEditTextSelectionRec (); -// selection.selStart = (short) Math.min (Math.max (Math.min (start, end), 0), length); -// selection.selEnd = (short) Math.min (Math.max (Math.max (start, end), 0), length); +// selection.selStart = cast(short) Math.min (Math.max (Math.min (start, end), 0), length); +// selection.selEnd = cast(short) Math.min (Math.max (Math.max (start, end), 0), length); // if (hasFocus ()) { // OS.SetControlData (handle, OS.kControlEntireControl, OS.kControlEditTextSelectionTag, 4, selection); // } else { @@ -1463,7 +1463,7 @@ NSRange range = new NSRange (); range.location = start; range.length = end - start + 1; - ((NSTextView)view).setSelectedRange (range); + (cast(NSTextView)view).setSelectedRange (range); } } @@ -1524,7 +1524,7 @@ // if (txnObject is 0) return; // this.tabs = tabs; // TXNTab tab = new TXNTab (); -// tab.value = (short) (textExtent (new char[]{' '}, 0).x * tabs); +// tab.value = cast(short) (textExtent (new char[]{' '}, 0).x * tabs); // int [] tags = new int [] {OS.kTXNTabSettingsTag}; // int [] datas = new int [1]; // OS.memmove (datas, tab, TXNTab.sizeof); @@ -1555,9 +1555,9 @@ } NSString str = NSString.stringWith(string); if ((style & DWT.SINGLE) !is 0) { - new NSCell(((NSTextField)view).cell()).setTitle(str); + new NSCell((cast(NSTextField)view).cell()).setTitle(str); } else { - ((NSTextView)view).setString(str); + (cast(NSTextView)view).setString(str); } sendEvent (DWT.Modify); } @@ -1608,7 +1608,7 @@ checkWidget(); if ((style & DWT.SINGLE) !is 0) return; //TODO no working - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; NSRange range = new NSRange(); NSRect rect = widget.firstRectForCharacterRange(range); view.scrollRectToVisible(rect); @@ -1632,7 +1632,7 @@ if ((style & DWT.SINGLE) !is 0) { setSelection (getSelection()); } else { - NSTextView widget = (NSTextView)view; + NSTextView widget = cast(NSTextView)view; widget.scrollRangeToVisible(widget.selectedRange()); } }