dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2378:cc858be0cb81

iOS: More work on conversion from Mac... going to be a few more of these type commits before I actually get a building source.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 19 Mar 2021 18:19:47 +0000
parents	6393d8c10569
children	e35887009bb5

comparison

equal deleted inserted replaced

-:6393d8c10569
+:cc858be0cb81
 }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a top-level window */
-@interface DWView : DWBox <UIWindowDelegate>
+@interface DWView : DWBox /* <UIWindowDelegate> */
 {
 UIMenu *windowmenu;
 CGSize oldsize;
 }
 -(BOOL)windowShouldClose:(id)sender;
 return NO;
 return YES;
 }
 -(void)viewDidMoveToWindow
 {
+#if 0 /* TODO */
 [[UINotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:UIWindowDidResizeNotification object:[self window]];
 [[UINotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:UIWindowDidBecomeMainNotification object:[self window]];
+#endif
 }
 -(void)dealloc
 {
 if(windowmenu)
 {
 _event_handler([self window], nil, 13);
 }
 -(void)setMenu:(UIMenu *)input { windowmenu = input; [windowmenu retain]; }
 -(void)menuHandler:(id)sender
 {
-id menu = [sender menu];
+[DWObj menuHandler:sender];
-/* Find the highest menu for this item */
-while([menu supermenu])
-{
-menu = [menu supermenu];
-}
-/* Only perform the delay if this item is a child of the main menu */
-if([DWApp mainMenu] == menu)
-[DWObj performSelector:@selector(menuHandler:) withObject:sender afterDelay:0];
-else
-[DWObj menuHandler:sender];
-}
--(void)mouseDragged:(UIEvent *)theEvent { _event_handler(self, theEvent, 5); }
--(void)mouseMoved:(UIEvent *)theEvent
-{
-id hit = [self hitTest:[theEvent locationInWindow]];
-if([hit isMemberOfClass:[DWRender class]])
-{
-_event_handler(hit, theEvent, 5);
-}
 }
 @end
 /* Subclass for a button type */
 @interface DWButton : UIButton
 DWBox *parent;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)buttonClicked:(id)sender;
--(void)setButtonType:(UIButtonType)input;
 -(UIButtonType)buttonType;
 -(void)setParent:(DWBox *)input;
 -(DWBox *)parent;
--(UIColor *)textColor;
--(void)setTextColor:(UIColor *)textColor;
 @end
 @implementation DWButton
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)buttonClicked:(id)sender
 {
 _event_handler(self, nil, 8);
-if([self buttonType] == DWButtonTypeRadio)
+}
-{
-DWBox *viewbox = [self parent];
-Box *thisbox = [viewbox box];
-int z;
-for(z=0;z<thisbox->count;z++)
-{
-if(thisbox->items[z].type != TYPEBOX)
-{
-id object = thisbox->items[z].hwnd;
-if([object isMemberOfClass:[DWButton class]])
-{
-DWButton *button = object;
-if(button != self && [button buttonType] == DWButtonTypeRadio)
-{
-[button setState:DWControlStateValueOff];
-}
-}
-}
-}
-}
-}
--(void)setButtonType:(UIButtonType)input { buttonType = input; [super setButtonType:input]; }
 -(UIButtonType)buttonType { return buttonType; }
 -(void)setParent:(DWBox *)input { parent = input; }
 -(DWBox *)parent { return parent; }
--(UIColor *)textColor
-{
-NSAttributedString *attrTitle = [self attributedTitle];
-NSUInteger len = [attrTitle length];
-NSRange range = NSMakeRange(0, MIN(len, 1));
-NSDictionary *attrs = [attrTitle fontAttributesInRange:range];
-UIColor *textColor = [UIColor controlTextColor];
-if (attrs) {
-textColor = [attrs objectForKey:NSForegroundColorAttributeName];
-}
-return textColor;
-}
--(void)setTextColor:(UIColor *)textColor
-{
-NSMutableAttributedString *attrTitle = [[NSMutableAttributedString alloc]
-initWithAttributedString:[self attributedTitle]];
-NSUInteger len = [attrTitle length];
-NSRange range = NSMakeRange(0, len);
-[attrTitle addAttribute:NSForegroundColorAttributeName
-value:textColor
-range:range];
-[attrTitle fixAttributesInRange:range];
-[self setAttributedTitle:attrTitle];
-[attrTitle release];
-}
--(void)keyDown:(UIEvent *)theEvent
-{
-unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
-if(vk == VK_RETURN || vk == VK_SPACE)
-{
-if(buttonType == DWButtonTypeSwitch)
-[self setState:([self state] ? DWControlStateValueOff : DWControlStateValueOn)];
-else if(buttonType == DWButtonTypeRadio)
-[self setState:DWControlStateValueOn];
-[self buttonClicked:self];
-}
-else
-{
-[self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
-[super keyDown:theEvent];
-}
-}
--(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
--(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a progress type */
-@interface DWPercent : NSProgressIndicator
+@interface DWPercent : UIProgressView
 {
 void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)setBox:(void *)input { box = input; }
 -(id)box { return box; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
-@end
-/* Subclass for a textfield that supports vertical centering */
-@interface DWTextFieldCell : UITextFieldCell
-{
-BOOL vcenter;
-}
--(CGRect)drawingRectForBounds:(CGRect)theRect;
--(void)setVCenter:(BOOL)input;
-@end
-@implementation DWTextFieldCell
--(CGRect)drawingRectForBounds:(CGRect)theRect
-{
-/* Get the parent's idea of where we should draw */
-CGRect newRect = [super drawingRectForBounds:theRect];
-/* If we are being vertically centered */
-if(vcenter)
-{
-/* Get our ideal size for current text */
-CGSize textSize = [self cellSizeForBounds:theRect];
-/* Center that in the proposed rect */
-float heightDelta = newRect.size.height - textSize.height;
-if (heightDelta > 0)
-{
-newRect.size.height -= heightDelta;
-newRect.origin.y += (heightDelta / 2);
-}
-}
-return newRect;
-}
--(void)setVCenter:(BOOL)input { vcenter = input; }
 @end
 @interface DWEntryFieldFormatter : NSFormatter
 {
 int maxLength;
 @implementation DWEntryField
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)setClickDefault:(id)input { clickDefault = input; }
--(void)keyUp:(UIEvent *)theEvent
-{
-unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
-if(clickDefault && vk == VK_RETURN)
-{
-if([clickDefault isKindOfClass:[UIButton class]])
-[clickDefault buttonClicked:self];
-else
-[[self window] makeFirstResponder:clickDefault];
-} else
-{
-[super keyUp:theEvent];
-}
-}
--(BOOL)performKeyEquivalent:(UIEvent *)theEvent
-{
-if(([theEvent modifierFlags] & DWEventModifierFlagDeviceIndependentFlagsMask) == DWEventModifierFlagCommand)
-{
-if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"x"])
-return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];
-else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"c"])
-return [NSApp sendAction:@selector(copy:) to:[[self window] firstResponder] from:self];
-else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"v"])
-return [NSApp sendAction:@selector(paste:) to:[[self window] firstResponder] from:self];
-else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"a"])
-return [NSApp sendAction:@selector(selectAll:) to:[[self window] firstResponder] from:self];
-}
-return [super performKeyEquivalent:theEvent];
-}
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a text and status text type */
-@interface DWText : UITextField
+@interface DWText : UILabel
 {
 void *userdata;
 id clickDefault;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
 @end
-/* Subclass for a entryfield password type */
-@interface DWEntryFieldPassword : NSSecureTextField
-{
-void *userdata;
-id clickDefault;
-}
--(void *)userdata;
--(void)setUserdata:(void *)input;
--(void)setClickDefault:(id)input;
-@end
-@implementation DWEntryFieldPassword
--(void *)userdata { return userdata; }
--(void)setUserdata:(void *)input { userdata = input; }
--(void)setClickDefault:(id)input { clickDefault = input; }
--(void)keyUp:(UIEvent *)theEvent
-{
-if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
-{
-if([clickDefault isKindOfClass:[UIButton class]])
-[clickDefault buttonClicked:self];
-else
-[[self window] makeFirstResponder:clickDefault];
-}
-else
-{
-[super keyUp:theEvent];
-}
-}
--(BOOL)performKeyEquivalent:(UIEvent *)theEvent
-{
-if(([theEvent modifierFlags] & DWEventModifierFlagDeviceIndependentFlagsMask) == DWEventModifierFlagCommand)
-{
-if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"x"])
-return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];
-else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"c"])
-return [NSApp sendAction:@selector(copy:) to:[[self window] firstResponder] from:self];
-else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"v"])
-return [NSApp sendAction:@selector(paste:) to:[[self window] firstResponder] from:self];
-else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"a"])
-return [NSApp sendAction:@selector(selectAll:) to:[[self window] firstResponder] from:self];
-}
-return [super performKeyEquivalent:theEvent];
-}
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
-@end
 /* Subclass for a Notebook control type */
-@interface DWNotebook : NSTabView <NSTabViewDelegate>
+@interface DWNotebook : UISegmentedControl
 {
 void *userdata;
 int pageid;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(int)pageid;
 -(void)setPageid:(int)input;
--(void)tabView:(NSTabView *)notebook didSelectTabViewItem:(NSTabViewItem *)notepage;
+-(void)pageChanged;
 @end
 /* Subclass for a Notebook page type */
-@interface DWNotebookPage : NSTabViewItem
+@interface DWNotebookPage : UISegmentedControl
 {
 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)tabView:(NSTabView *)notebook didSelectTabViewItem:(NSTabViewItem *)notepage
+-(void)pageChanged
 {
+#if 0 /* TODO: Implement page/segment changed handler */
 id object = [notepage view];
 DWNotebookPage *page = (DWNotebookPage *)notepage;
 if([object isMemberOfClass:[DWBox class]])
 {
 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
--(void)keyDown:(UIEvent *)theEvent
+}
-{
-unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
-if(vk == NSTabCharacter || vk == NSBackTabCharacter)
-[self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
-else if(vk == NSLeftArrowFunctionKey)
-{
-NSArray *pages = [self tabViewItems];
-DWNotebookPage *page = (DWNotebookPage *)[self selectedTabViewItem];
-NSUInteger index = [pages indexOfObject:page];
-if(index != NSNotFound)
-{
-if(index > 0)
-[self selectTabViewItem:[pages objectAtIndex:(index-1)]];
-else
-[self selectTabViewItem:[pages objectAtIndex:0]];
-}
-}
-else if(vk == NSRightArrowFunctionKey)
-{
-NSArray *pages = [self tabViewItems];
-DWNotebookPage *page = (DWNotebookPage *)[self selectedTabViewItem];
-NSUInteger index = [pages indexOfObject:page];
-NSUInteger count = [pages count];
-if(index != NSNotFound)
-{
-if(index + 1 < count)
-[self selectTabViewItem:[pages objectAtIndex:(index+1)]];
-else
-[self selectTabViewItem:[pages objectAtIndex:(count-1)]];
-}
-}
-[super keyDown:theEvent];
-}
--(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
--(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 @implementation DWNotebookPage
 -(void *)userdata { return userdata; }
 -(void)setPageid:(int)input { pageid = input; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a splitbar type */
-@interface DWSplitBar : NSSplitView <NSSplitViewDelegate>
+@interface DWSplitBar : UISplitViewController
 {
 void *userdata;
 float percent;
 NSInteger Tag;
 }
 @end
 @implementation DWSplitBar
 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification
 {
-NSArray *views = [self subviews];
+NSArray *views = [self.view subviews];
 id object;
 for(object in views)
 {
 if([object isMemberOfClass:[DWBox class]])
 @end
 @implementation DWSlider
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)sliderChanged:(id)sender { _event_handler(self, (void *)[self integerValue], 14); }
+-(void)sliderChanged:(id)sender { int intVal = (int)[self value]; _event_handler(self, DW_INT_TO_POINTER(intVal), 14); }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
-@end
-/* Subclass for a slider type */
-@interface DWScrollbar : NSScroller
-{
-void *userdata;
-double range;
-double visible;
-int vertical;
-}
--(void *)userdata;
--(void)setUserdata:(void *)input;
--(float)range;
--(float)visible;
--(int)vertical;
--(void)setVertical:(int)value;
--(void)setRange:(double)input1 andVisible:(double)input2;
--(void)scrollerChanged:(id)sender;
-@end
-@implementation DWScrollbar
--(void *)userdata { return userdata; }
--(void)setUserdata:(void *)input { userdata = input; }
--(float)range { return range; }
--(float)visible { return visible; }
--(int)vertical { return vertical; }
--(void)setVertical:(int)value { vertical = value; }
--(void)setRange:(double)input1 andVisible:(double)input2 { range = input1; visible = input2; }
--(void)scrollerChanged:(id)sender
-{
-double max = (range - visible);
-double result = ([self doubleValue] * max);
-double newpos = result;
-switch ([sender hitPart])
-{
-case NSScrollerDecrementPage:
-newpos -= visible;
-if(newpos < 0)
-{
-newpos = 0;
-}
-break;
-case NSScrollerIncrementPage:
-newpos += visible;
-if(newpos > max)
-{
-newpos = max;
-}
-break;
-default:
-; /* do nothing */
-}
-int newposi = (int)newpos;
-newpos = (newpos - (double)newposi) > 0.5 ? (double)(newposi + 1) : (double)newposi;
-if(newpos != result)
-{
-[self setDoubleValue:(newpos/max)];
-}
-_event_handler(self, DW_INT_TO_POINTER((int)newpos), 14);
-}
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a MLE type */
 @interface DWMLE : UITextView
 -(id)scrollview { return scrollview; }
 -(void)setScrollview:(id)input { scrollview = input; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
-NSTableCellView *_dw_table_cell_view_new(UIImage *icon, NSString *text)
+UITableViewCell *_dw_table_cell_view_new(UIImage *icon, NSString *text)
 {
-NSTableCellView *browsercell = [[[NSTableCellView alloc] init] autorelease];
+UITableViewCell *browsercell = [[[UITableViewCell alloc] init] autorelease];
 [browsercell setAutoresizesSubviews:YES];
 if(icon)
 {
 UIImageView *iv = [[[UIImageView alloc] init] autorelease];
-[iv setAutoresizingMask:UIViewHeightSizable|(text ? 0 :UIViewWidthSizable)];
+[iv setAutoresizingMask:UIViewAutoresizingFlexibleHeight|(text ? 0 :UIViewAutoresizingFlexibleWidth)];
 [iv setImage:icon];
 [browsercell setImageView:iv];
 [browsercell addSubview:iv];
 }
 if(text)
 {
-UITextField *tf = [[[UITextField alloc] init] autorelease];
+/* Might switch to UITextFieldView in the future if they need to be editable */
-[tf setAutoresizingMask:UIViewHeightSizable|UIViewWidthSizable];
+UILabel *label = [[[UILabel alloc] init] autorelease];
-[tf setStringValue:text];
+[label setAutoresizingMask:UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleWidth];
-[tf setEditable:NO];
+[label setText:text];
-[tf setBezeled:NO];
+[browsercell setTextField:label];
-[tf setBordered:NO];
+[browsercell addSubview:label];
-[tf setDrawsBackground:NO];
-[[tf cell] setVCenter:YES];
-[browsercell setTextField:tf];
-[browsercell addSubview:tf];
 }
 return browsercell;
 }
 void _dw_table_cell_view_layout(NSTableCellView *result)
 UIImage *icon = [iv image];
 UITextField *tf = [result textField];
 CGRect rect = result.frame;
 int width =[icon size].width;
-[iv setFrame:NSMakeRect(0,0,width,rect.size.height)];
+[iv setFrame:CGRectMake(0,0,width,rect.size.height)];
 /* Adjust the rect to allow space for the image */
 rect.origin.x += width;
 rect.size.width -= width;
 [tf setFrame:rect];
 }
 }
-@interface DWFocusRingScrollView : UIScrollView
-{
-BOOL shouldDrawFocusRing;
-NSResponder* lastResp;
-}
-@end
-@implementation DWFocusRingScrollView
--(BOOL)needsDisplay;
-{
-NSResponder* resp = nil;
-if([[self window] isKeyWindow])
-{
-resp = [[self window] firstResponder];
-if (resp == lastResp)
-return [super needsDisplay];
-}
-else if (lastResp == nil)
-{
-return [super needsDisplay];
-}
-shouldDrawFocusRing = (resp != nil && [resp isKindOfClass:[UIView class]] && [(UIView*)resp isDescendantOf:self]);
-lastResp = resp;
-[self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
-return YES;
-}
--(void)drawRect:(CGRect)rect
-{
-[super drawRect:rect];
-if(shouldDrawFocusRing)
-{
-NSSetFocusRingStyle(NSFocusRingOnly);
-UIRectFill(rect);
-}
-}
-@end
 /* Subclass for a Container/List type */
 @interface DWContainer : NSTableView <NSTableViewDataSource,NSTableViewDelegate>
 {
 void *userdata;
 [ object isMemberOfClass:[DWSlider class] ])
 {
 thiswidth = 100;
 thisheight = 20;
 }
-/* Handle the ranged widgets */
-else if([ object isMemberOfClass:[DWScrollbar class] ])
-{
-if([object vertical])
-{
-thiswidth = 14;
-thisheight = 100;
-}
-else
-{
-thiswidth = 100;
-thisheight = 14;
-}
-}
 /* Handle bitmap size */
 else if([ object isMemberOfClass:[UIImageView class] ])
 {
 UIImage *image = [object image];
 [button setTitle:[ NSString stringWithUTF8String:text ]];
 }
 [button setTarget:button];
 [button setAction:@selector(buttonClicked:)];
 [button setTag:cid];
-[button setButtonType:DWButtonTypeMomentaryPushIn];
-[button setBezelStyle:DWBezelStyleRegularSquare];
-/* TODO: Reenable scaling in the future if it is possible on other platforms.
-[[button cell] setImageScaling:UIImageScaleProportionallyDown]; */
 if(DWDefaultFont)
 {
 [[button cell] 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 setButtonType:DWButtonTypeMomentaryPushIn];
-[button setBezelStyle:DWBezelStyleRounded];
 [button setImagePosition:NSNoImage];
 [button setAlignment:DWTextAlignmentCenter];
 [[button cell] setControlTint:NSBlueControlTint];
 return button;
 }
 HWND API dw_entryfield_new(const char *text, ULONG cid)
 {
 DWEntryField *entry = [[DWEntryField alloc] init];
 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
 [entry setTag:cid];
-[[entry cell] setScrollable:YES];
-[[entry cell] setWraps:NO];
 return entry;
 }
 /*
 * Create a new Entryfield (password) window (widget) to be packed.
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_entryfield_password_new(const char *text, ULONG cid)
 {
-DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
+DWEntryField *entry = dw_entryfield_new(text, cid);
-[entry setStringValue:[ NSString stringWithUTF8String:text ]];
+[entry setSecureTextEntry:YES];
-[entry setTag:cid];
-[[entry cell] setScrollable:YES];
-[[entry cell] setWraps:NO];
 return entry;
 }
 /*
 * Sets the entryfield character limit.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_radiobutton_new(const char *text, ULONG cid)
 {
 DWButton *button = _dw_button_new(text, cid);
-[button setButtonType:DWButtonTypeRadio];
+/* TODO: Customize to be a radio button */
 return button;
 }
 /*
 * Create a new slider window (widget) to be packed.
 *       increments: Number of increments available.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_scrollbar_new(int vertical, ULONG cid)
 {
-DWScrollbar *scrollbar;
+/*TODO: Implement scrollbars if possible */
-if(vertical)
+return 0;
-{
-scrollbar = [[DWScrollbar alloc] init];
-[scrollbar setVertical:YES];
-}
-else
-{
-scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)];
-}
-[scrollbar setRange:0.0 andVisible:0.0];
-[scrollbar setKnobProportion:1.0];
-[scrollbar setTarget:scrollbar];
-[scrollbar setAction:@selector(scrollerChanged:)];
-[scrollbar setTag:cid];
-[scrollbar setEnabled:YES];
-return scrollbar;
 }
 /*
 * Returns the position of the scrollbar.
 * Parameters:
 *          handle: Handle to the scrollbar to be queried.
 */
 unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
-DWScrollbar *scrollbar = handle;
+/*TODO: Implement scrollbars if possible */
-float range = [scrollbar range];
+return 0;
-float fresult = [scrollbar doubleValue] * range;
-return (int)fresult;
 }
 /*
 * Sets the scrollbar position.
 * Parameters:
 *          handle: Handle to the scrollbar to be set.
 *          position: Position of the scrollbar withing the range.
 */
 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
 {
-DWScrollbar *scrollbar = handle;
+/*TODO: Implement scrollbars if possible */
-double range = [scrollbar range];
-double visible = [scrollbar visible];
-double newpos = (double)position/(range-visible);
-[scrollbar setDoubleValue:newpos];
 }
 /*
 * Sets the scrollbar range.
 * Parameters:
 *          range: Maximum range value.
 *          visible: Visible area relative to the range.
 */
 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
 {
-DWScrollbar *scrollbar = handle;
+/*TODO: Implement scrollbars if possible */
-double knob = (double)visible/(double)range;
-[scrollbar setRange:(double)range andVisible:(double)visible];
-[scrollbar setKnobProportion:knob];
 }
 /*
 * Create a new percent bar window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_checkbox_new(const char *text, ULONG cid)
 {
 DWButton *button = _dw_button_new(text, cid);
-[button setButtonType:DWButtonTypeSwitch];
+/* TODO: Switch to UISwitch control with text */
-[button setBezelStyle:DWBezelStyleRegularSquare];
 return button;
 }
 /*
 * Returns the state of the checkbox.
 [object setTextColor:(fg ? fg : [UIColor controlTextColor])];
 [cell setTextColor:(fg ? fg : [UIColor controlTextColor])];
 }
 if([object isMemberOfClass:[DWButton class]])
 {
-[object setTextColor:(fg ? fg : [UIColor controlTextColor])];
+[object setTitleColor:(fg ? fg : [UIColor controlTextColor])];
 }
 if([object isKindOfClass:[UITextField class]] || [object isKindOfClass:[UIButton class]])
 {
 id cell = [object cell];
 tmp |= style;
 issm(window, sssm, tmp);
 }
 }
-else if([object isKindOfClass:[UITextField class]])
+else if([object isKindOfClass:[UILabel class]])
 {
-UITextField *tf = object;
+UILabel *label = object;
-DWTextFieldCell *cell = [tf cell];
+[label setTextAlignment:(style & 0xF)];
-[cell setAlignment:(style & 0xF)];
+#if 0 /* TODO: Implement vertical centering */
-if(mask & DW_DT_VCENTER && [cell isMemberOfClass:[DWTextFieldCell class]])
+if(mask & DW_DT_VCENTER)
 {
 [cell setVCenter:(style & DW_DT_VCENTER ? YES : NO)];
 }
-if(mask & DW_DT_WORDBREAK && [cell isMemberOfClass:[DWTextFieldCell class]])
+#endif
-{
+if(mask & DW_DT_WORDBREAK)
-[cell setWraps:(style & DW_DT_WORDBREAK ? YES : NO)];
+{
+if(style & DW_DT_WORDBREAK)
+[label setLineBreakMode:NSLineBreakByWordWrapping];
+else
+[label setLineBreakMode:NSLineBreakByTruncatingTail];
 }
 }
 else if([object isMemberOfClass:[UITextView class]])
 {
 UITextView *tv = handle;

Mercurial > dwindows

comparison ios/dw.m @ 2378:cc858be0cb81