dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2819:a2fc275fa9bb

iOS: Fix major memory leaks when destroying widgets and windows. More surely needs to be done regardig this, iOS doesn't destroy subviews as expected when the parent is removed. I was expecting it to bring the reference counts to 0 and starts destroying subviews... so I had to do this manually. Boxes, ScrollBoxes, Spinbuttons and Comboboxes all now destroy their subviews. Probably will need to do the same for splitbar, notebooks and possibly others. However this stops the memory leak in Interface Builder when recreating the interface. Also need to figure out why the reference count is lower for DWButtons.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 02 Aug 2022 06:17:09 +0000
parents	d5d09bdd61d6
children	b6ae5b017b28

comparison

equal deleted inserted replaced

-:d5d09bdd61d6
+:a2fc275fa9bb
 if(box->items)
 free(box->items);
 free(box);
 _dw_remove_userdata(&root, NULL, TRUE);
 dw_signal_disconnect_by_window(self);
+for(id object in [self subviews])
+{
+NSUInteger rc = [object retainCount];
+[object removeFromSuperview];
+/* TODO: Fix the cause of this...
+* DWButtons have a lower retain count than the other widgets...
+* so this release causes a crash. Figure out why it is lower...
+* and make the others that way too.
+*/
+if(rc > 2)
+[object release];
+}
 [super dealloc];
 }
 -(Box *)box { return box; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 @implementation DWScrollBox
 -(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; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [box removeFromSuperview]; [box release]; [super dealloc]; }
 @end
 /* Subclass for a entryfield type */
 @interface DWEntryField : UITextField <UITextFieldDelegate>
 {
 -(id)topLeft { return topleft; }
 -(void)setTopLeft:(id)input
 {
 topleft = input;
 [self addSubview:topleft];
-[topleft autorelease];
+[topleft release];
 }
 -(id)bottomRight { return bottomright; }
 -(void)setBottomRight:(id)input
 {
 bottomright = input;
 [self addSubview:bottomright];
-[bottomright autorelease];
+[bottomright release];
 }
 -(int)type { return splittype; }
 -(void)setType:(int)input { splittype = input; }
 -(void)resize
 {
 /* TODO: UITableView does not support variable columns...
 * also OutlineView does not exist in iOS.
 */
 UITableViewCell *_dw_table_cell_view_new(UIImage *icon, NSString *text)
 {
-UITableViewCell *browsercell = [[[UITableViewCell alloc] init] autorelease];
+UITableViewCell *browsercell = [[UITableViewCell alloc] init];
 [browsercell setAutoresizesSubviews:YES];
 if(icon)
 [[browsercell imageView] setImage:icon];
 if(text)
 {
 self = [super init];
 if(self)
 {
-textfield = [[[UITextField alloc] init] autorelease];
+textfield = [[UITextField alloc] init];
 [self addSubview:textfield];
-stepper = [[[DWStepper alloc] init] autorelease];
+stepper = [[DWStepper alloc] init];
 [self addSubview:stepper];
 [stepper setParent:self];
 [stepper setTextfield:textfield];
 [textfield setText:[NSString stringWithFormat:@"%ld",(long)[stepper value]]];
 [textfield setDelegate:self];
 {
 [textfield setText:[NSString stringWithFormat:@"%d", (int)[theStepper value]]];
 _dw_event_handler(self, DW_INT_TO_POINTER((int)[stepper value]), _DW_EVENT_VALUE_CHANGED);
 }
 -(void)setClickDefault:(id)input { clickDefault = input; }
--(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc
+{
+UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE);
+dw_signal_disconnect_by_window(self);
+[textfield removeFromSuperview];
+[textfield release];
+[stepper removeFromSuperview];
+[stepper release];
+[super dealloc];
+}
 @end
 API_AVAILABLE(ios(10.0))
 @interface DWUserNotificationCenterDelegate : NSObject <UNUserNotificationCenterDelegate>
 @end
 {
 UIPickerView* pickerView;
 NSMutableArray* dataArray;
 UIBarStyle toolbarStyle;
 int selectedIndex;
+void *userdata;
 }
 -(void)setToolbarStyle:(UIBarStyle)style;
 -(void)append:(NSString *)item;
 -(void)insert:(NSString *)item atIndex:(int)index;
 -(void)clear;
 -(int)count;
 -(NSString *)getTextAtIndex:(int)index;
 -(void)setText:(NSString *)item atIndex:(int)index;
 -(void)deleteAtIndex:(int)index;
 -(int)selectedIndex;
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
 @end
 @implementation DWComboBox
 -(id)init
 {
 [self setInputView:nil];
 [self setInputAccessoryView:nil];
 return [super becomeFirstResponder];
 }
 -(int)selectedIndex { return selectedIndex; }
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
+-(void)dealloc
+{
+UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE);
+dw_signal_disconnect_by_window(self);
+[dataArray release];
+[super dealloc];
+}
 @end
 /* Subclass for a MDI type
 * This is just a box for display purposes... but it is a
 * unique class so it can be identified when creating windows.
 button2 = @"No";
 button3 = @"Cancel";
 }
 va_start(args, format);
-mtext = [[[NSString alloc] initWithFormat:[NSString stringWithUTF8String:format] arguments:args] autorelease];
+mtext = [[NSString alloc] initWithFormat:[NSString stringWithUTF8String:format] arguments:args];
 va_end(args);
 params = [NSMutableArray arrayWithObjects:mtitle, mtext, [NSNumber numberWithInteger:mstyle], button1, button2, button3, nil];
 [DWObj safeCall:@selector(messageBox:) withObject:params];
 in_mb = FALSE;
 DWBox *tmpbox = dw_box_new(DW_VERT, 0);
 dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
 [scrollbox setBox:box];
 [scrollbox addSubview:tmpbox];
 [scrollbox setScrollEnabled:YES];
-[tmpbox autorelease];
+[tmpbox release];
 DW_FUNCTION_RETURN_THIS(scrollbox);
 }
 /*
 * Returns the position of the scrollbar in the scrollbox
 [cont setAllowsMultipleSelection:(multi ? YES : NO)];
 [cont setDataSource:cont];
 [cont setDelegate:cont];
 [cont setTag:cid];
-[cont autorelease];
 [cont setRowBgOdd:DW_RGB_TRANSPARENT andEven:DW_RGB_TRANSPARENT];
 return cont;
 }
 /*
 DW_FUNCTION_DEFINITION(dw_combobox_new, HWND, const char *text, ULONG cid)
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_combobox_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
-DWComboBox *combo = [[DWComboBox alloc] init];
+DWComboBox *combo = [[[DWComboBox alloc] init] retain];
 if(text)
 [combo setText:[NSString stringWithUTF8String:text]];
 [combo setTag:cid];
 DW_FUNCTION_RETURN_THIS(combo);
 }
 size.width = size.height;
 [mle setAutoresizingMask:UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleWidth];
 [mle setScrollEnabled:YES];
 [mle setTag:cid];
-[mle autorelease];
 DW_FUNCTION_RETURN_THIS(mle);
 }
 /*
 * Adds text to an MLE box and returns the current point.
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
 DW_FUNCTION_INIT;
 DWTree *tree = [[[DWTree alloc] init] retain];
 [tree setTag:cid];
-[tree autorelease];
 DW_FUNCTION_RETURN_THIS(tree);
 }
 /*
 * Inserts an item into a tree window (widget) after another item.
 else
 [treeparent appendChild:treeitem];
 }
 else
 [tree insertTreeItem:treeitem];
-[treeitem autorelease];
 DW_FUNCTION_RETURN_THIS(treeitem);
 }
 /*
 * Inserts an item into a tree window (widget).
 */
 HPIXMAP API dw_pixmap_new_from_file(HWND handle, const char *filename)
 {
 HPIXMAP pixmap;
 DW_LOCAL_POOL_IN;
-char *ext = _dw_get_image_extension( filename );
+char *ext = _dw_get_image_extension(filename);
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 {
 DW_LOCAL_POOL_OUT;
 return NULL;
 }
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
-UIImage *tmpimage = [[[UIImage alloc] initWithContentsOfFile:nstr] autorelease];
+UIImage *tmpimage = [[UIImage alloc] initWithContentsOfFile:nstr];
 if(!tmpimage && ext)
 {
 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
-tmpimage = [[[UIImage alloc] initWithContentsOfFile:nstr] autorelease];
+tmpimage = [[UIImage alloc] initWithContentsOfFile:nstr];
 }
 if(!tmpimage)
 {
 DW_LOCAL_POOL_OUT;
 return NULL;
 }
 pixmap->width = [tmpimage size].width;
 pixmap->height = [tmpimage size].height;
-pixmap->image = [[DWImage alloc] initWithUIImage:tmpimage];
+pixmap->image = [[[DWImage alloc] initWithUIImage:tmpimage] retain];
 pixmap->handle = handle;
 DW_LOCAL_POOL_OUT;
 return pixmap;
 }
 {
 DW_LOCAL_POOL_OUT;
 return NULL;
 }
 NSData *thisdata = [NSData dataWithBytes:data length:len];
-UIImage *tmpimage = [[[UIImage alloc] initWithData:thisdata] autorelease];
+UIImage *tmpimage = [[UIImage alloc] initWithData:thisdata];
 if(!tmpimage)
 {
 DW_LOCAL_POOL_OUT;
 return NULL;
 }
 pixmap->width = [tmpimage size].width;
 pixmap->height = [tmpimage size].height;
-pixmap->image = [[DWImage alloc] initWithUIImage:tmpimage];
+pixmap->image = [[[DWImage alloc] initWithUIImage:tmpimage] retain];
 pixmap->handle = handle;
 DW_LOCAL_POOL_OUT;
 return pixmap;
 }
 NSDate *date;
 char buffer[101] = {0};
 snprintf(buffer, 100, "%04d-%02d-%02d", year, month, day);
-NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
+NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
 dateFormatter.dateFormat = @"yyyy-MM-dd";
 date = [dateFormatter dateFromString:[NSString stringWithUTF8String:buffer]];
 [calendar setDate:date];
 [date release];
 DW_FUNCTION_RETURN(dw_notebook_page_new, ULONG)
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, DW_UNUSED(flags), ULONG, front, int)
 {
 DWNotebook *notebook = handle;
 NSInteger page = [notebook pageid];
-DWNotebookPage *notepage = [[[DWNotebookPage alloc] init] retain];
+DWNotebookPage *notepage = [[DWNotebookPage alloc] init];
 NSMutableArray<DWNotebookPage *> *views = [notebook views];
 unsigned long retval;
 [notepage setPageid:(int)page];
 if(front)
 {
 [[notebook tabs] insertSegmentWithTitle:@"" atIndex:[[notebook tabs] numberOfSegments] animated:NO];
 [views addObject:notepage];
 }
 [notebook addSubview:notepage];
-[notepage autorelease];
 [notebook setPageid:(int)(page+1)];
 if([views count] != 1)
 {
 /* Otherwise hide the page */
 }
 if(index != -1)
 {
 [object removeFromSuperview];
+[object release];
 if(thisbox->count > 1)
 {
 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
 {
 if(data)
 {
 DW_LOCAL_POOL_IN;
 NSData *thisdata = [NSData dataWithBytes:data length:len];
-UIImage *pixmap = [[[UIImage alloc] initWithData:thisdata] autorelease];
+UIImage *pixmap = [[UIImage alloc] initWithData:thisdata];
 if(pixmap)
 {
 if([object isMemberOfClass:[DWButton class]])
 {
 if(filename)
 {
 char *ext = _dw_get_image_extension( filename );
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
-bitmap = [[[UIImage alloc] initWithContentsOfFile:nstr] autorelease];
+bitmap = [[UIImage alloc] initWithContentsOfFile:nstr];
 if(!bitmap && ext)
 {
 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
-bitmap = [[[UIImage alloc] initWithContentsOfFile:nstr] autorelease];
+bitmap = [[UIImage alloc] initWithContentsOfFile:nstr];
 }
 }
 if(!bitmap && resid > 0 && resid < 65536)
 {
 bitmap = _dw_icon_load(resid);

Mercurial > dwindows

comparison ios/dw.m @ 2819:a2fc275fa9bb