dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2419:65ff339e9cd2

iOS: A number of fixes, notebook layout select first page if none selected. DWText is a kind of UILabel so check Kind not Member. Disable the calendar control for now, since it was hanging the UI. Cleanup some of the dwtest changes, now that no tabs are disabled. Remove some unnecessary macros since functionality is included in the thread safety macros.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 03 Apr 2021 18:44:01 +0000
parents	ccfc4ee9c4a7
children	384d076ed52a

comparison

equal deleted inserted replaced

-:50e1ddce0aeb
+:65ff339e9cd2
 -(NSMutableArray<DWNotebookPage *> *)views { return views; };
 -(void)pageChanged:(id)sender
 {
 NSInteger intpageid = [tabs selectedSegmentIndex];
-if(intpageid != NSNotFound && intpageid < [views count])
+if(intpageid != -1 && intpageid < [views count])
 {
 DWNotebookPage *page = [views objectAtIndex:intpageid];
 /* Hide the previously visible page contents */
 if(page != visible)
 else if([handle isMemberOfClass:[DWNotebook class]])
 {
 DWNotebook *notebook = handle;
 NSInteger intpageid = [[notebook tabs] selectedSegmentIndex];
-if(intpageid != NSNotFound && intpageid < [[notebook views] count])
+if(intpageid != -1 && intpageid < [[notebook views] count])
 {
 DWNotebookPage *page = [[notebook views] objectAtIndex:intpageid];
 if([page isKindOfClass:[DWBox class]])
 {
 /* Special handling for notebook controls */
 if([handle isMemberOfClass:[DWNotebook class]])
 {
 DWNotebook *notebook = handle;
 NSInteger intpageid = [[notebook tabs] selectedSegmentIndex];
-if(intpageid != NSNotFound && intpageid < [[notebook views] count])
+if(intpageid == -1)
+{
+if([[notebook tabs] numberOfSegments] > 0)
+{
+DWNotebookPage *notepage = [[notebook views] firstObject];
+/* If there is no selected segment, select the first one... */
+[[notebook tabs] setSelectedSegmentIndex:0];
+intpageid = 0;
+[notepage setHidden:NO];
+}
+}
+if(intpageid != -1 && intpageid < [[notebook views] count])
 {
 DWNotebookPage *page = [[notebook views] objectAtIndex:intpageid];
 /* If the new page is a valid box, lay it out */
 if([page isKindOfClass:[DWBox class]])
 if(thisheight < _DW_SCROLLED_MIN_HEIGHT)
 thisheight = _DW_SCROLLED_MIN_HEIGHT;
 if(thisheight > _DW_SCROLLED_MAX_HEIGHT)
 thisheight = _DW_SCROLLED_MAX_HEIGHT;
 }
-else if([ object isMemberOfClass:[UILabel class] ])
+else if([ object isKindOfClass:[UILabel class] ])
 nsstr = [object text];
 /* Any other control type */
 else if([ object isKindOfClass:[ UIControl class ] ])
 nsstr = [object text];
 DW_FUNCTION_DEFINITION(dw_calendar_new, HWND, ULONG cid)
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_calendar_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
+DWCalendar *calendar = nil;
+#if 0 /* TODO: Figure out why this hangs the UI */
 DWCalendar *calendar = [[[DWCalendar alloc] init] retain];
 [calendar setDatePickerMode:UIDatePickerModeDate];
 [calendar setTag:cid];
 [calendar setDate:[NSDate date]];
+#endif
 DW_FUNCTION_RETURN_THIS(calendar);
 }
 /*
 * Sets the current date of a calendar.
 DW_FUNCTION_NO_RETURN(dw_calendar_set_date)
 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, year, unsigned int, month, unsigned int, day, unsigned int)
 {
 DWCalendar *calendar = handle;
 NSDate *date;
-char buffer[101];
+char buffer[101] = {0};
-DW_LOCAL_POOL_IN;
 snprintf(buffer, 100, "%04d-%02d-%02d", year, month, day);
 NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
 dateFormatter.dateFormat = @"yyyy-MM-dd";
 date = [dateFormatter dateFromString:[NSString stringWithUTF8String:buffer]];
 [calendar setDate:date];
 [date release];
-DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 * Gets the current date of a calendar.
 DW_FUNCTION_ADD_PARAM4(handle, year, month, day)
 DW_FUNCTION_NO_RETURN(dw_calendar_get_date)
 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, year, unsigned int *, month, unsigned int *, day, unsigned int *)
 {
 DWCalendar *calendar = handle;
-DW_LOCAL_POOL_IN;
 NSCalendar *mycalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
 NSDate *date = [calendar date];
 NSDateComponents* components = [mycalendar components:NSCalendarUnitDay|NSCalendarUnitMonth|NSCalendarUnitYear fromDate:date];
 *day = (unsigned int)[components day];
 *month = (unsigned int)[components month];
 *year = (unsigned int)[components year];
 [mycalendar release];
-DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 * Causes the embedded HTML widget to take action.
 }
 [notebook addSubview:notepage];
 [notepage autorelease];
 [notebook setPageid:(int)(page+1)];
-#if 0
-if([views objectAtIndex:[[notebook tabs] selectedSegmentIndex]] == notepage)
-{
-/* If the page we added is the visible page.. lay it out */
-[notebook pageChanged:notebook];
-}
-else
-#endif
 if([views count] != 1)
 {
 /* Otherwise hide the page */
 [notepage setHidden:YES];
 }
 {
 DWNotebook *notebook = handle;
 NSInteger index = [[notebook tabs] selectedSegmentIndex];
 unsigned long retval = 0;
-if(index != NSNotFound)
+if(index != -1)
 {
 NSMutableArray<DWNotebookPage *> *views = [notebook views];
 DWNotebookPage *notepage = [views objectAtIndex:index];
 retval = [notepage pageid];
 if(notepage != nil)
 {
 NSMutableArray<DWNotebookPage *> *views = [notebook views];
 NSUInteger index = [views indexOfObject:notepage];
-if(index != NSNotFound)
+if(index != -1)
 {
-[notebook tabs].selectedSegmentIndex = index;
+[[notebook tabs] setSelectedSegmentIndex:index];
 }
 }
 DW_FUNCTION_RETURN_NOTHING;
 }

Mercurial > dwindows

comparison ios/dw.m @ 2419:65ff339e9cd2