dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2381:3777ea1cccdb

iOS: Continuing conversion...

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 20 Mar 2021 21:53:56 +0000
parents	93424ad710de
children	41a04e6b3e8e

comparison

equal deleted inserted replaced

-:93424ad710de
+:3777ea1cccdb
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(int)pageid;
 -(void)setPageid:(int)input;
--(void)pageChanged;
+-(void)pageChanged:(id)sender;
 @end
 /* Subclass for a Notebook page type */
-@interface DWNotebookPage : UISegmentedControl
+@interface DWNotebookPage : UIView
 {
 void *userdata;
 int pageid;
 }
 -(void *)userdata;
 @implementation DWNotebook
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(int)pageid { return pageid; }
 -(void)setPageid:(int)input { pageid = input; }
--(void)pageChanged
+-(void)pageChanged:(id)sender
 {
 #if 0 /* TODO: Implement page/segment changed handler */
 id object = [notepage view];
 DWNotebookPage *page = (DWNotebookPage *)notepage;
 Box *box = [view box];
 CGSize size = [view frame].size;
 _do_resize(box, size.width, size.height);
 _handle_resize_events(box);
 }
-_event_handler(self, DW_INT_TO_POINTER([page pageid]), 15);
 #endif
+_event_handler(self, DW_INT_TO_POINTER([self selectedSegmentIndex]), 15);
 }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 @implementation DWNotebookPage
 _event_handler(handle, nil, 1);
 }
 }
 }
 /* Special handling for notebook controls */
+#if 0 /* TODO: Segmented control might not have subviews */
 else if([handle isMemberOfClass:[DWNotebook class]])
 {
 DWNotebook *notebook = (DWNotebook *)handle;
-DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
+NSInteger index = [notebook selectedSegmentIndex];
 id view = [notepage view];
 if([view isMemberOfClass:[DWBox class]])
 {
 Box *box = (Box *)[view box];
 _handle_resize_events(box);
 }
 }
+#endif
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 */
 else if([handle isMemberOfClass:[DWScrollBox class]])
 {
 DWScrollBox *scrollbox = (DWScrollBox *)handle;
-DWBox *contentbox = [scrollbox documentView];
+NSArray *subviews = [scrollbox subviews];
+DWBox *contentbox = [subviews firstObject];
 Box *thisbox = [contentbox box];
 /* Get the required space for the box */
 _handle_resize_events(thisbox);
 }
 /* If the calculated size is valid... */
 if(height > 0 && width > 0)
 {
 int pad = thisbox->items[z].pad;
 UIView *handle = thisbox->items[z].hwnd;
-CGPoint point;
+CGRect rect;
-CGSize size;
+rect.origin.x = currentx + pad;
-point.x = currentx + pad;
+rect.origin.y = currenty + pad;
-point.y = currenty + pad;
+rect.size.width = width;
-size.width = width;
+rect.size.height = height;
-size.height = height;
+[handle setFrame:rect];
-[handle setFrameOrigin:point];
-[handle setFrameSize:size];
 /* After placing a box... place its components */
 if(thisbox->items[z].type == TYPEBOX)
 {
 id box = thisbox->items[z].hwnd;
 _resize_box(tmp, depth, width, height, pass);
 (*depth)--;
 }
 }
+#if 0 /* TODO: Segemented control may not have subviews */
 /* Special handling for notebook controls */
 if([handle isMemberOfClass:[DWNotebook class]])
 {
 DWNotebook *notebook = (DWNotebook *)handle;
-DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
+NSInteger index = [notebook selectedSegmentIndex];
 id view = [notepage view];
 if([view isMemberOfClass:[DWBox class]])
 {
 Box *box = (Box *)[view box];
 CGSize size = [view frame].size;
 _do_resize(box, size.width, size.height);
 _handle_resize_events(box);
 }
 }
+#endif
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 */
 else if([handle isMemberOfClass:[DWScrollBox class]])
 {
 int depth = 0;
 DWScrollBox *scrollbox = (DWScrollBox *)handle;
-DWBox *contentbox = [scrollbox contentView];
+NSArray *subviews = [scrollbox subviews];
+DWBox *contentbox = [subviews firstObject];
 Box *thisbox = [contentbox box];
 CGSize contentsize = [scrollbox contentSize];
+CGRect frame = [contentbox frame];
 /* Get the required space for the box */
 _resize_box(thisbox, &depth, x, y, 1);
 if(contentsize.width < thisbox->minwidth)
 }
 if(contentsize.height < thisbox->minheight)
 {
 contentsize.height = thisbox->minheight;
 }
-[contentbox setFrameSize:contentsize];
+frame.size = contentsize;
+[contentbox setFrame:frame];
 /* Layout the content of the scrollbox */
 _do_resize(thisbox, contentsize.width, contentsize.height);
 _handle_resize_events(thisbox);
 }
 else if([handle isMemberOfClass:[DWSpinButton class]])
 {
 DWSpinButton *spinbutton = (DWSpinButton *)handle;
 UITextField *textfield = [spinbutton textfield];
 UIStepper *stepper = [spinbutton stepper];
-[textfield setFrameOrigin:CGPointMake(0,0)];
+[textfield setFrame:CGRectMake(0,0,rect.size.width-20,rect.size.height)];
-[textfield setFrameSize:CGSizeMake(size.width-20,size.height)];
+[stepper setFrame:CGRectMake(rect.size.width-20,0,20,rect.size.height)];
-[stepper setFrameOrigin:CGPointMake(size.width-20,0)];
-[stepper setFrameSize:CGSizeMake(20,size.height)];
 }
 else if([handle isMemberOfClass:[DWSplitBar class]])
 {
 DWSplitBar *split = (DWSplitBar *)handle;
-DWWindow *window = (DWWindow *)[split window];
 float percent = [split percent];
-if(percent > 0 && size.width > 20 && size.height > 20)
+if(percent > 0 && rect.size.width > 20 && rect.size.height > 20)
 {
 dw_splitbar_set(handle, percent);
 [split setPercent:0];
 }
-else if([window redraw])
+[split splitViewDidResizeSubviews:nil];
-{
-[split splitViewDidResizeSubviews:nil];
-}
 }
 /* Advance the current position in the box */
 if(thisbox->type == DW_HORZ)
 currentx += width + (pad * 2);
 {
 DWScrollBox *scrollbox = [[DWScrollBox alloc] init];
 DWBox *box = dw_box_new(type, pad);
 DWBox *tmpbox = dw_box_new(DW_VERT, 0);
 dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
-[scrollbox setHasVerticalScroller:YES];
-[scrollbox setHasHorizontalScroller:YES];
-[scrollbox setBorderType:NSNoBorder];
-[scrollbox setDrawsBackground:NO];
 [scrollbox setBox:box];
-[scrollbox setDocumentView:tmpbox];
+[scrollbox addSubview:tmpbox];
 [tmpbox autorelease];
 return scrollbox;
 }
 /*
 *          orient: The vertical or horizontal scrollbar.
 */
 int API dw_scrollbox_get_pos(HWND handle, int orient)
 {
 DWScrollBox *scrollbox = handle;
-UIView *view = [scrollbox documentView];
+NSArray *subviews = [scrollbox subviews];
+UIView *view = [subviews firstObject];
 CGSize contentsize = [scrollbox contentSize];
-NSScroller *scrollbar;
+CGPoint contentoffset = [scrollbox contentOffset];
 int range = 0;
 int val = 0;
 if(orient == DW_VERT)
 {
-scrollbar = [scrollbox verticalScroller];
 range = [view bounds].size.height - contentsize.height;
+val = contentoffset.y;
 }
 else
 {
-scrollbar = [scrollbox horizontalScroller];
 range = [view bounds].size.width - contentsize.width;
-}
+val = contentoffset.x;
-if(range > 0)
+}
-{
+if(val > range)
-val = [scrollbar floatValue] * range;
+{
+val = range;
 }
 return val;
 }
 /*
 *          orient: The vertical or horizontal scrollbar.
 */
 int API dw_scrollbox_get_range(HWND handle, int orient)
 {
 DWScrollBox *scrollbox = handle;
-UIView *view = [scrollbox documentView];
+NSArray *subviews = [scrollbox subviews];
+UIView *view = [subviews firstObject];
 int range = 0;
 if(orient == DW_VERT)
 {
 range = [view bounds].size.height;
 }
 if([object isMemberOfClass:[ DWSpinButton class]])
 {
 DWSpinButton *spinbutton = object;
 object = [spinbutton textfield];
 }
+#if 0 /* TODO: Fix this when we have a groupbox implemented */
 if([object isMemberOfClass:[ NSBox class]])
 {
 NSBox *box = object;
 id content = [box contentView];
 if([content isMemberOfClass:[ DWText class]])
 {
 object = content;
 }
 }
+#endif
 return object;
 }
 /* Internal function to calculate the widget's required size..
 * These are the general rules for widget sizes:
 /* Handle all the different button types */
 if([ object isKindOfClass:[ UIButton class ] ])
 {
 switch([object buttonType])
 {
-case DWButtonTypeSwitch:
-case DWButtonTypeRadio:
-extrawidth = 24;
-extraheight = 4;
-nsstr = [object title];
-break;
 default:
 {
-UIImage *image = [object image];
+UIImage *image = (UIImage *)[object image];
 if(image)
 {
 /* Image button */
 CGSize size = [image size];
 thiswidth = (int)size.width;
 thisheight = (int)size.height;
-if([object isBordered])
-{
-extrawidth = 4;
-extraheight = 4;
-}
 }
 else
 {
 /* Text button */
 nsstr = [object title];
-if([object isBordered])
+extrawidth = 8;
-{
+extraheight = 4;
-extrawidth = 30;
-extraheight = 8;
-}
-else
-{
-extrawidth = 8;
-extraheight = 4;
-}
 }
 break;
 }
 }
 }
 }
 else
 nsstr = [object stringValue];
 if(font)
-thisheight = (int)[font boundingRectForFont].size.height;
+thisheight = (int)[font lineHeight];
 }
 /* Handle the ranged widgets */
 else if([ object isMemberOfClass:[DWPercent class] ] ||
 [ object isMemberOfClass:[DWSlider class] ])
 {
 thisheight = 20;
 }
 /* Handle bitmap size */
 else if([ object isMemberOfClass:[UIImageView class] ])
 {
-UIImage *image = [object image];
+UIImage *image = (UIImage *)[object image];
 if(image)
 {
 CGSize size = [image size];
 thiswidth = (int)size.width;
 }
 }
 /* Handle calendar */
 else if([ object isMemberOfClass:[DWCalendar class] ])
 {
-NSCell *cell = [object cell];
+CGSize size = [object intrinsicContentSize];
-if(cell)
-{
-CGSize size = [cell cellSize];
 thiswidth = size.width;
 thisheight = size.height;
-}
 }
 /* MLE and Container */
 else if([ object isMemberOfClass:[DWMLE class] ] ||
 [ object isMemberOfClass:[DWContainer class] ])
 {
 CGSize size;
 if([ object isMemberOfClass:[DWMLE class] ])
 {
 UIScrollView *sv = [object scrollview];
-CGSize frame = [sv frame].size;
+CGRect frame = [sv frame];
-BOOL hscroll = [sv hasHorizontalScroller];
-/* Make sure word wrap is off for the first part */
-if(!hscroll)
-{
-[[object textContainer] setWidthTracksTextView:NO];
-[[object textContainer] setContainerSize:[object maxSize]];
-[object setHorizontallyResizable:YES];
-[sv setHasHorizontalScroller:YES];
-}
 /* Size the text view to fit */
 [object sizeToFit];
-size = [object bounds].size;
+frame.size = [object bounds].size;
-size.width += 2.0;
+frame.size.width += 2.0;
-size.height += 2.0;
+frame.size.height += 2.0;
-/* Re-enable word wrapping if it was on */
+[sv setFrame:frame];
-if(!hscroll)
-{
-[[object textContainer] setWidthTracksTextView:YES];
-[sv setHasHorizontalScroller:NO];
-/* If the un wrapped it is beyond the bounds... */
-if(size.width > _DW_SCROLLED_MAX_WIDTH)
-{
-CGSize max = [object maxSize];
-/* Set the max size to the limit */
-[object setMaxSize:NSMakeSize(_DW_SCROLLED_MAX_WIDTH, max.height)];
-/* Recalculate the size */
-[object sizeToFit];
-size = [object bounds].size;
-size.width += 2.0;
-size.height += 2.0;
-[object setMaxSize:max];
-}
-}
-[sv setFrameSize:frame];
-/* Take into account the horizontal scrollbar */
-if(hscroll && size.width > _DW_SCROLLED_MAX_WIDTH)
-size.height += 16.0;
 }
 else
 size = [object getsize];
 thiswidth = size.width;
 if(thisheight < _DW_SCROLLED_MIN_HEIGHT)
 thisheight = _DW_SCROLLED_MIN_HEIGHT;
 if(thisheight > _DW_SCROLLED_MAX_HEIGHT)
 thisheight = _DW_SCROLLED_MAX_HEIGHT;
 }
-/* Tree */
-else if([ object isMemberOfClass:[DWTree class] ])
-{
-thiswidth = (int)((_DW_SCROLLED_MAX_WIDTH + _DW_SCROLLED_MIN_WIDTH)/2);
-thisheight = (int)((_DW_SCROLLED_MAX_HEIGHT + _DW_SCROLLED_MIN_HEIGHT)/2);
-}
 /* Any other control type */
 else if([ object isKindOfClass:[ UIControl class ] ])
 nsstr = [object stringValue];
 /* If we have a string...
 dw_font_text_extents_get(object, NULL, (char *)[nsstr UTF8String], &thiswidth, &thisheight);
 /* Handle static text fields */
 if([object isKindOfClass:[ UITextField class ]] && ![object isEditable])
 {
-id border = handle;
 extrawidth = 10;
-/* Handle status bar field */
-if([border isMemberOfClass:[ NSBox class ] ])
-{
-extrawidth += 2;
-extraheight = 8;
-}
 }
 /* Set the requested sizes */
 if(width)
 *width = thiswidth + extrawidth;
 /* Query the objects */
 if([ object isKindOfClass:[ UIWindow class ] ])
 {
 UIWindow *window = box;
-view = [window contentView];
+NSArray *subviews = [window subviews];
+view = [subviews firstObject];
 }
 else if([ object isMemberOfClass:[ DWScrollBox class ] ])
 {
 DWScrollBox *scrollbox = box;
 view = [scrollbox box];
 thisitem = thisbox->items;
 object = item;
 /* Query the objects */
 if([ object isMemberOfClass:[ DWContainer class ] ] ||
-[ object isMemberOfClass:[ DWTree class ] ] ||
 [ object isMemberOfClass:[ DWMLE class ] ])
 {
 this = item = [object scrollview];
 }
 DWBox *parent = (DWBox *)[object superview];
 /* Some controls are embedded in scrollviews...
 * so get the parent of the scrollview in that case.
 */
-if(([object isKindOfClass:[NSTableView class]] || [object isMemberOfClass:[DWMLE class]])
+if(([object isKindOfClass:[UITableView class]] || [object isMemberOfClass:[DWMLE class]]))
-&& [parent isMemberOfClass:[NSClipView class]])
 {
 object = [parent superview];
 parent = (DWBox *)[object superview];
 }
 HWND _dw_button_new(const char *text, ULONG cid)
 {
 DWButton *button = [[DWButton alloc] init];
 if(text)
 {
-[button setTitle:[ NSString stringWithUTF8String:text ]];
+[button setTitle:[NSString stringWithUTF8String:text] forState:UIControlStateNormal];
 }
-[button setTarget:button];
+[button addTarget:button
-[button setAction:@selector(buttonClicked:)];
+action:@selector(buttonClicked:)
+forControlEvents:UIControlEventPrimaryActionTriggered];
 [button setTag:cid];
 if(DWDefaultFont)
 {
-[[button cell] setFont:DWDefaultFont];
+[[button titleLabel] setFont:DWDefaultFont];
 }
 return button;
 }
 /*
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_button_new(const char *text, ULONG cid)
 {
 DWButton *button = _dw_button_new(text, cid);
-[button setImagePosition:NSNoImage];
+[button setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
-[button setAlignment:DWTextAlignmentCenter];
-[[button cell] setControlTint:NSBlueControlTint];
 return button;
 }
 /*
 * Create a new Entryfield window (widget) to be packed.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_entryfield_new(const char *text, ULONG cid)
 {
 DWEntryField *entry = [[DWEntryField alloc] init];
-[entry setStringValue:[ NSString stringWithUTF8String:text ]];
+[entry setText:[ NSString stringWithUTF8String:text ]];
 [entry setTag:cid];
 return entry;
 }
 /*
 {
 DWEntryField *entry = handle;
 DWEntryFieldFormatter *formatter = [[[DWEntryFieldFormatter alloc] init] autorelease];
 [formatter setMaximumLength:(int)limit];
-[[entry cell] setFormatter:formatter];
+[entry setFormatter:formatter];
 }
 /*
 * Create a new bitmap button window (widget) to be packed.
 * Parameters:
 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
 UIImage *image = [[UIImage alloc] initWithContentsOfFile:filepath];
 DWButton *button = _dw_button_new("", resid);
 if(image)
 {
-[button setImage:image];
+[button setImage:image forState:UIControlStateNormal];
 }
-if(text)
-[button setToolTip:[NSString stringWithUTF8String:text]];
 [image release];
 return button;
 }
 /*
 image = [[UIImage alloc] initWithContentsOfFile:nstr];
 }
 DWButton *button = _dw_button_new("", cid);
 if(image)
 {
-[button setImage:image];
+[button setImage:image forState:UIControlStateNormal];
 }
-if(text)
-[button setToolTip:[NSString stringWithUTF8String:text]];
 [image release];
 return button;
 }
 /*
 NSData *thisdata = [NSData dataWithBytes:data length:len];
 UIImage *image = [[UIImage alloc] initWithData:thisdata];
 DWButton *button = _dw_button_new("", cid);
 if(image)
 {
-[button setImage:image];
+[button setImage:image forState:UIControlStateNormal];
 }
-if(text)
-[button setToolTip:[NSString stringWithUTF8String:text]];
 [image release];
 return button;
 }
 /*
 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
 UIStepper *stepper = [spinbutton stepper];
 UITextField *textfield = [spinbutton textfield];
 long val = atol(text);
-[stepper setIncrement:1];
+[stepper setStepValue:1];
 [stepper setTag:cid];
-[stepper setMinValue:-65536];
+[stepper setMinimumValue:-65536];
-[stepper setMaxValue:65536];
+[stepper setMaximumValue:65536];
 [stepper setValue:(float)val];
 [textfield setText:[NSString stringWithFormat:@"%ld",val]];
 return spinbutton;
 }
 {
 DWSpinButton *spinbutton = handle;
 UIStepper *stepper = [spinbutton stepper];
 UITextField *textfield = [spinbutton textfield];
 [stepper setValue:(float)position];
-[textfield [NSString stringWithFormat:@"%ld",position]];
+[textfield setText:[NSString stringWithFormat:@"%ld",position]];
 }
 /*
 * Sets the spinbutton limits.
 * Parameters:
 */
 void API dw_spinbutton_set_limits(HWND handle, long upper, long lower)
 {
 DWSpinButton *spinbutton = handle;
 UIStepper *stepper = [spinbutton stepper];
-[stepper setMinValue:(double)lower];
+[stepper setMinimumValue:(double)lower];
-[stepper setMaxValue:(double)upper];
+[stepper setMaximumValue:(double)upper];
 }
 /*
 * Returns the current value of the spinbutton.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_slider_new(int vertical, int increments, ULONG cid)
 {
 DWSlider *slider = [[DWSlider alloc] init];
-[slider setMaxValue:(double)increments];
+[slider setMaximumValue:(double)increments];
-[slider setMinValue:0];
+[slider setMinimumValue:0];
 [slider setContinuous:YES];
 [slider setTarget:slider];
 [slider setAction:@selector(sliderChanged:)];
 [slider setTag:cid];
 return slider;
 *          handle: Handle to the slider to be queried.
 */
 unsigned int API dw_slider_get_pos(HWND handle)
 {
 DWSlider *slider = handle;
-double val = [slider doubleValue];
+double val = [slider value];
 return (int)val;
 }
 /*
 * Sets the slider position.
 *          position: Position of the slider withing the range.
 */
 void API dw_slider_set_pos(HWND handle, unsigned int position)
 {
 DWSlider *slider = handle;
-[slider setDoubleValue:(double)position];
+[slider setValue:(double)position];
 }
 /*
 * Create a new scrollbar window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_percent_new(ULONG cid)
 {
 DWPercent *percent = [[DWPercent alloc] init];
-[percent setStyle:DWProgressIndicatorStyleBar];
-[percent setBezeled:YES];
-[percent setMaxValue:100];
-[percent setMinValue:0];
-[percent incrementBy:1];
-[percent setIndeterminate:NO];
-[percent setDoubleValue:0];
 /*[percent setTag:cid]; Why doesn't this work? */
 return percent;
 }
 /*
 DWPercent *percent = handle;
 /* Handle indeterminate */
 if(position == DW_PERCENT_INDETERMINATE)
 {
-[percent setIndeterminate:YES];
+[percent setProgress:0 animated:NO];
-[percent startAnimation:percent];
 }
 else
 {
 /* Handle normal */
-if([percent isIndeterminate])
+[percent setProgress:(float)position/100.0 animated:YES];
-{
-[percent stopAnimation:percent];
-[percent setIndeterminate:NO];
-}
-[percent setDoubleValue:(double)position];
 }
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 *          handle: Handle to the checkbox to be queried.
 *          value: TRUE for checked, FALSE for unchecked.
 */
 void API dw_checkbox_set(HWND handle, int value)
 {
+#if 0 /* TODO: Convert to UISwitch */
 DWButton *button = handle;
 if(value)
 {
 [button setState:DWControlStateValueOn];
 }
 else
 {
 [button setState:DWControlStateValueOff];
 }
+#endif
 }
 /* Internal common function to create containers and listboxes */
 HWND _dw_cont_new(ULONG cid, int multi)
 {
-DWFocusRingScrollView *scrollview  = [[DWFocusRingScrollView alloc] init];
 DWContainer *cont = [[DWContainer alloc] init];
-[cont setScrollview:scrollview];
-[scrollview setBorderType:NSBezelBorder];
-[scrollview setHasVerticalScroller:YES];
-[scrollview setAutohidesScrollers:YES];
 [cont setAllowsMultipleSelection:(multi ? YES : NO)];
-[cont setAllowsColumnReordering:NO];
 [cont setDataSource:cont];
 [cont setDelegate:cont];
-[scrollview setDocumentView:cont];
 [cont setTag:cid];
 [cont autorelease];
 [cont setRowBgOdd:DW_RGB_TRANSPARENT andEven:DW_RGB_TRANSPARENT];
 return cont;
 }
 DW_FUNCTION_RETURN(dw_listbox_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
 {
 DW_FUNCTION_INIT;
 DWContainer *cont = _dw_cont_new(cid, multi);
-[cont setHeaderView:nil];
-int type = DW_CFA_STRING;
 [cont setup];
-NSTableColumn *column = [[[NSTableColumn alloc] initWithIdentifier:@"_DWListboxColumn"] autorelease];
-[column setEditable:NO];
-[cont addTableColumn:column];
-[cont addColumn:column andType:type];
 DW_FUNCTION_RETURN_THIS(cont);
 }
 /*
 * Appends the specified text to the listbox's (or combobox) entry list.
 id object = handle;
 if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
+NSIndexPath *myIP = [NSIndexPath indexPathForRow:top inSection:0];
-[cont scrollRowToVisible:top];
+[cont scrollToRowAtIndexPath:myIP atScrollPosition:UITableViewScrollPositionNone animated:NO];
 }
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 {
 *buffer = '\0';
 }
 else
 {
-NSTableCellView *cell = [cont getRow:index and:0];
+UITableViewCell *cell = [cont getRow:index and:0];
-NSString *nstr = [[cell textField] stringValue];
+NSString *nstr;
+if(@available(iOS 14.0, *))
+{
+UIListContentConfiguration *content = [cell defaultContentConfiguration];
+nstr = [content text];
+}
+else
+{
+nstr = [cell text];
+}
 strncpy(buffer, [nstr UTF8String], length - 1);
 }
 }
 DW_FUNCTION_RETURN_NOTHING;
 int count = (int)[cont numberOfRowsInTableView:cont];
 if(index <= count)
 {
 NSString *nstr = [NSString stringWithUTF8String:buffer];
-NSTableCellView *cell = [cont getRow:index and:0];
+UITableViewCell *cell = [cont getRow:index and:0];
-[[cell textField] setStringValue:nstr];
+if(@available(iOS 14.0, *))
+{
+UIListContentConfiguration *content = [cell defaultContentConfiguration];
+[content setText:nstr];
+}
+else
+{
+[cell setText:nstr];
+}
 [cont reloadData];
 [cont setNeedsDisplay];
 }
 }
 DW_FUNCTION_RETURN_NOTHING;
 int result = -1;
 if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
-result = (int)[cont indexPathForSelectedRow].row;
+NSIndexPath *ip = [cont indexPathForSelectedRow];
+if(ip)
+result = (int)ip.row;
 }
 DW_FUNCTION_RETURN_THIS(result);
 }
 /*
 id object = handle;
 int retval = -1;
 if([object isMemberOfClass:[DWContainer class]])
 {
-NSUInteger result;
 DWContainer *cont = handle;
 NSArray *selected = [cont indexPathsForSelectedRows];
-if(where == -1)
+NSIndexPath *ip = [selected objectAtIndex:(where == -1 ? 0 :where)];
-result = [selected objectAtIndex:0];
-else
+if(ip)
-result = [selected objectAtIndex:where];
+retval = (int)ip.row;
-if(result)
-{
-retval = (int)result;
-}
 }
 DW_FUNCTION_RETURN_THIS(retval)
 }
 /*
 * Parameters:
 *          handle: Handle to the listbox to be set.
 *          index: Item index.
 *          state: TRUE if selected FALSE if unselected.
 */
-DW_FUNCTION_DEFINITION(dw_listbox_select, void, HWND handle, int index, int state)
+DW_FUNCTION_DEFINITION(dw_listbox_select, void, HWND handle, int index, DW_UNUSED(int state))
 DW_FUNCTION_ADD_PARAM3(handle, index, state)
 DW_FUNCTION_NO_RETURN(dw_listbox_select)
-DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, int, state, int)
+DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, int, DW_UNUSED(state), int)
 {
 DW_FUNCTION_INIT;
 id object = handle;
 if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
-NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
+NSIndexPath *ip = [NSIndexPath indexPathForRow:index inSection:0];
-[cont selectRowIndexes:selected byExtendingSelection:YES];
+[cont selectRowAtIndexPath:ip
-[selected release];
+animated:NO
+scrollPosition:UITableViewScrollPositionNone];
 }
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 * Create a new Combobox window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the combpbox widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_combobox_new, HWND, const char *text, ULONG cid);
+HWND API dw_combobox_new(const char *text, ULONG cid)
 {
 /* TODO: Implment comboboxes. https://www.codeproject.com/Articles/301681/iPhone-ComboBox */
 return 0;
 }
 */
 HWND API dw_mle_new(ULONG cid)
 {
 DWMLE *mle = [[DWMLE alloc] init];
 UIScrollView *scrollview  = [[UIScrollView alloc] init];
-CGSize size = [mle maxSize];
+CGSize size = [mle intrinsicContentSize];
 size.width = size.height;
-[mle setMaxSize:size];
+[mle setAutoresizingMask:UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleWidth];
-[scrollview setBorderType:NSBezelBorder];
-[scrollview setHasVerticalScroller:YES];
-[scrollview setAutohidesScrollers:YES];
-[scrollview setAutoresizingMask:UIViewWidthSizable|UIViewHeightSizable];
-[scrollview setDocumentView:mle];
-[mle setVerticallyResizable:YES];
-[mle setAutoresizingMask:UIViewWidthSizable|UIViewHeightSizable];
 [mle setScrollview:scrollview];
-[mle setAutomaticQuoteSubstitutionEnabled:NO];
-[mle setAutomaticDashSubstitutionEnabled:NO];
-[mle setAutomaticTextReplacementEnabled:NO];
 /* [mle setTag:cid]; Why doesn't this work? */
 [mle autorelease];
 return mle;
 }
 DW_FUNCTION_INIT;
 DWMLE *mle = handle;
 unsigned int retval;
 NSTextStorage *ts = [mle textStorage];
 NSString *nstr = [NSString stringWithUTF8String:buffer];
-UIColor *fgcolor = [ts foregroundColor];
+NSAttributedString *nastr = [[NSAttributedString alloc] initWithString:nstr];
-UIFont *font = [ts font];
-NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init];
-[attributes setObject:(fgcolor ? fgcolor : [UIColor textColor]) forKey:NSForegroundColorAttributeName];
-if(font)
-[attributes setObject:font forKey:UIFontAttributeName];
-NSAttributedString *nastr = [[NSAttributedString alloc] initWithString:nstr attributes:attributes];
 NSUInteger length = [ts length];
 if(startpoint < 0)
 startpoint = 0;
 if(startpoint > length)
 startpoint = (int)length;
 *          handle: Handle to the MLE.
 *          state: TRUE if it wraps, FALSE if it doesn't.
 */
 void API dw_mle_set_word_wrap(HWND handle, int state)
 {
-DWMLE *mle = handle;
+/* TODO: Figure out how to do this in iOS */
-UIScrollView *sv = [mle scrollview];
-if(state)
-{
-CGSize newsize = NSMakeSize([sv contentSize].width,[mle maxSize].height);
-CGRect newrect = NSMakeRect(0, 0, [sv contentSize].width, 0);
-[[mle textContainer] setWidthTracksTextView:YES];
-[mle setFrame:newrect];
-[[mle textContainer] setContainerSize:newsize];
-[mle setHorizontallyResizable:NO];
-[sv setHasHorizontalScroller:NO];
-}
-else
-{
-[[mle textContainer] setWidthTracksTextView:NO];
-[[mle textContainer] setContainerSize:[mle maxSize]];
-[mle setHorizontallyResizable:YES];
-[sv setHasHorizontalScroller:YES];
-}
 }
 /*
 * Sets the word auto complete state of an MLE box.
 * Parameters:
 *          handle: Handle to the MLE.
 *          state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE
 */
 void API dw_mle_set_auto_complete(HWND handle, int state)
 {
-DWMLE *mle = handle;
+/* TODO: Figure out how to do this in iOS */
-[mle setAutomaticQuoteSubstitutionEnabled:(state & DW_MLE_COMPLETE_QUOTE ? YES : NO)];
-[mle setAutomaticDashSubstitutionEnabled:(state & DW_MLE_COMPLETE_DASH ? YES : NO)];
-[mle setAutomaticTextReplacementEnabled:(state & DW_MLE_COMPLETE_TEXT ? YES : NO)];
 }
 /*
 * Sets the current cursor position of an MLE box.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_status_text_new(const char *text, ULONG cid)
 {
-NSBox *border = [[NSBox alloc] init];
+return dw_text_new(text, cid);
-UITextField *textfield = dw_text_new(text, cid);
-[border setTitlePosition:NSNoTitle];
-[border setContentView:textfield];
-[border setContentViewMargins:NSMakeSize(1.5,1.5)];
-[textfield autorelease];
-[textfield setBackgroundColor:[UIColor clearColor]];
-[[textfield cell] setVCenter:YES];
-return border;
 }
 /*
 * Create a new static text window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_text_new(const char *text, ULONG cid)
 {
 DWText *textfield = [[DWText alloc] init];
-[textfield setEditable:NO];
+[textfield setText:[NSString stringWithUTF8String:text]];
-[textfield setSelectable:NO];
-[textfield setBordered:NO];
-[textfield setDrawsBackground:NO];
-[textfield setStringValue:[ NSString stringWithUTF8String:text ]];
 [textfield setTag:cid];
 if(DWDefaultFont)
 {
-[[textfield cell] setFont:DWDefaultFont];
+[textfield setFont:DWDefaultFont];
 }
-[[textfield cell] setWraps:NO];
 return textfield;
 }
 /*
 * Creates a rendering context widget (window) to be packed.
 UIColor *newcolor;
 DW_LOCAL_POOL_IN;
 _foreground = _get_color(value);
-newcolor = [[UIColor colorWithDeviceRed:    DW_RED_VALUE(_foreground)/255.0 green:
+newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_foreground)/255.0 green:
 DW_GREEN_VALUE(_foreground)/255.0 blue:
 DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_fg_color_key, newcolor);
 [oldcolor release];
 DW_LOCAL_POOL_OUT;
 }
 }
 else
 {
 _background = _get_color(value);
-newcolor = [[UIColor colorWithDeviceRed:    DW_RED_VALUE(_background)/255.0 green:
+newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_background)/255.0 green:
 DW_GREEN_VALUE(_background)/255.0 blue:
 DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_bg_color_key, newcolor);
 }
 [oldcolor release];
 DW_LOCAL_POOL_OUT;
 }
 * Returns:
 *       The selected color or the current color if cancelled.
 */
 unsigned long API dw_color_choose(unsigned long value)
 {
+#if 0 /* TODO: Implement this with UIColorPickerViewController */
 /* Create the Color Chooser Dialog class. */
 DWColorChoose *colorDlg;
 DWDialog *dialog;
 DW_LOCAL_POOL_IN;
 /* Figure out the value of what they returned */
 CGFloat red, green, blue;
 [color getRed:&red green:&green blue:&blue alpha:NULL];
 value = DW_RGB((int)(red * 255), (int)(green *255), (int)(blue *255));
 DW_LOCAL_POOL_OUT;
+#endif
 return value;
 }
 CGContextRef _dw_draw_context(UIImage *image)
 {
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
 {
 DW_FUNCTION_INIT;
 DWContainer *cont = handle;
 NSArray *selected = [cont indexPathsForSelectedRows];
-NSIndexPath *result = [selected objectAtIndex:0];
+NSIndexPath *result = [selected firstObject];
 void *retval = NULL;
 if(result)
 {
 if(flags & DW_CR_RETDATA)
 float API dw_splitbar_get(HWND handle)
 {
 DWSplitBar *split = handle;
 CGRect rect1 = [split frame];
 NSArray *subviews = [split subviews];
-UIView *view = [subviews objectAtIndex:0];
+UIView *view = [subviews firstObject];
 CGRect rect2 = [view frame];
 float pos, total, retval = 0.0;
 if([split isVertical])
 {
 total = rect1.size.width;
 */
 HWND API dw_notebook_new(ULONG cid, int top)
 {
 DWNotebook *notebook = [[DWNotebook alloc] init];
 [notebook setDelegate:notebook];
+[notebook addTarget:notebook
+action:@selector(pageChanged:)
+forControlEvents:UIControlEventValueChanged];
 /* [notebook setTag:cid]; Why doesn't this work? */
 return notebook;
 }
 /*

Mercurial > dwindows

comparison ios/dw.m @ 2381:3777ea1cccdb