dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2814:1b33d03568c4

Mac: Fix object/memory leaks... retain objects created with *_new() Then once added to a box with dw_box_pack_*() release and autorelease. So when the window is closed the objects should all get released. This is how it was originally designed, but it was never enabled. Similar changes coming to iOS soon.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 01 Aug 2022 16:55:06 +0000
parents	9c9b680f7772
children	1efe0ed76629

comparison

equal deleted inserted replaced

-:9c9b680f7772
+:1b33d03568c4
 @implementation DWMLE
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(id)scrollview { return scrollview; }
 -(void)setScrollview:(id)input { scrollview = 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); [scrollview release]; [super dealloc]; }
 @end
 #ifndef DW_USE_NSVIEW
 /* Subclass NSTextFieldCell for displaying image and text */
 @interface DWImageAndTextCell : NSTextFieldCell
 [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; _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); [scrollview release]; [super dealloc]; }
 @end
 /* Dive into the tree freeing all desired child nodes */
 void _dw_free_tree_recurse(NSMutableArray *node, NSMutableArray *item)
 {
 DW_FUNCTION_ADD_PARAM2(type, pad)
 DW_FUNCTION_RETURN(dw_box_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
 {
 DW_FUNCTION_INIT;
-DWBox *view = [[DWBox alloc] init];
+DWBox *view = [[[DWBox alloc] init] retain];
 Box *newbox = [view box];
 memset(newbox, 0, sizeof(Box));
 newbox->pad = pad;
 newbox->type = type;
 DW_FUNCTION_RETURN_THIS(view);
 *       pad: Number of pixels to pad around the box.
 *       title: Text to be displayined in the group outline.
 */
 HWND API dw_groupbox_new(int type, int pad, const char *title)
 {
-NSBox *groupbox = [[DWGroupBox alloc] init];
+NSBox *groupbox = [[[DWGroupBox alloc] init] retain];
 DWBox *thisbox = dw_box_new(type, pad);
 Box *box = [thisbox box];
 #ifndef BUILDING_FOR_CATALINA
 [groupbox setBorderType:NSBezelBorder];
 #endif
 [groupbox setTitle:[NSString stringWithUTF8String:title]];
 box->grouphwnd = groupbox;
 [groupbox setContentView:thisbox];
+[thisbox release];
 [thisbox autorelease];
 return groupbox;
 }
 /*
 *       type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
 *       pad: Number of pixels to pad around the box.
 */
 HWND API dw_scrollbox_new( int type, int pad )
 {
-DWScrollBox *scrollbox = [[DWScrollBox alloc] init];
+DWScrollBox *scrollbox = [[[DWScrollBox alloc] init] retain];
 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];
+[tmpbox release];
 [tmpbox autorelease];
 return scrollbox;
 }
 /*
 /* Update the item count */
 thisbox->count++;
 /* Add the item to the box */
 [view addSubview:this];
+[this release];
 /* Enable autorelease on the item...
 * so it will get destroyed when the parent is.
 */
 [this autorelease];
 /* If we are packing a button... */
 }
 /* Internal function to create a basic button, used by all button types */
 HWND _dw_button_new(const char *text, ULONG cid)
 {
-DWButton *button = [[DWButton alloc] init];
+DWButton *button = [[[DWButton alloc] init] retain];
 if(text)
 {
 [button setTitle:[ NSString stringWithUTF8String:text ]];
 }
 [button setTarget:button];
 *       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_new(const char *text, ULONG cid)
 {
-DWEntryField *entry = [[DWEntryField alloc] init];
+DWEntryField *entry = [[[DWEntryField alloc] init] retain];
 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
 [entry setTag:cid];
 [[entry cell] setScrollable:YES];
 [[entry cell] setWraps:NO];
 return entry;
 *       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];
+DWEntryFieldPassword *entry = [[[DWEntryFieldPassword alloc] init] retain];
 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
 [entry setTag:cid];
 [[entry cell] setScrollable:YES];
 [[entry cell] setWraps:NO];
 return entry;
 *       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_spinbutton_new(const char *text, ULONG cid)
 {
-DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
+DWSpinButton *spinbutton = [[[DWSpinButton alloc] init] retain];
 NSStepper *stepper = [spinbutton stepper];
 NSTextField *textfield = [spinbutton textfield];
 [stepper setIncrement:1];
 [stepper setTag:cid];
 [stepper setMinValue:-65536];
 *       increments: Number of increments available.
 *       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];
+DWSlider *slider = [[[DWSlider alloc] init] retain];
 [slider setMaxValue:(double)increments];
 [slider setMinValue:0];
 [slider setContinuous:YES];
 [slider setTarget:slider];
 [slider setAction:@selector(sliderChanged:)];
 HWND API dw_scrollbar_new(int vertical, ULONG cid)
 {
 DWScrollbar *scrollbar;
 if(vertical)
 {
-scrollbar = [[DWScrollbar alloc] init];
+scrollbar = [[[DWScrollbar alloc] init] retain];
 [scrollbar setVertical:YES];
 }
 else
 {
-scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)];
+scrollbar = [[[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)] retain];
 }
 #ifndef BUILDING_FOR_YOSEMITE
 [scrollbar setArrowsPosition:NSScrollerArrowsDefaultSetting];
 #endif
 [scrollbar setRange:0.0 andVisible:0.0];
 * 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];
+DWPercent *percent = [[[DWPercent alloc] init] retain];
 [percent setStyle:DWProgressIndicatorStyleBar];
 [percent setBezeled:YES];
 [percent setMaxValue:100];
 [percent setMinValue:0];
 [percent incrementBy:1];
 }
 /* Internal common function to create containers and listboxes */
 HWND _dw_cont_new(ULONG cid, int multi)
 {
-DWFocusRingScrollView *scrollview  = [[DWFocusRingScrollView alloc] init];
+DWFocusRingScrollView *scrollview  = [[[DWFocusRingScrollView alloc] init] retain];
-DWContainer *cont = [[DWContainer alloc] init];
+DWContainer *cont = [[[DWContainer alloc] init] retain];
 [cont setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_combobox_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
 DW_FUNCTION_INIT;
-DWComboBox *combo = [[DWComboBox alloc] init];
+DWComboBox *combo = [[[DWComboBox alloc] init] retain];
 [combo setStringValue:[NSString stringWithUTF8String:text]];
 [combo setDelegate:combo];
 [combo setTag:cid];
 DW_FUNCTION_RETURN_THIS(combo);
 }
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_mle_new(ULONG cid)
 {
-DWMLE *mle = [[DWMLE alloc] init];
+DWMLE *mle = [[[DWMLE alloc] init] retain];
-NSScrollView *scrollview  = [[NSScrollView alloc] init];
+NSScrollView *scrollview  = [[[NSScrollView alloc] init] retain];
 NSSize size = [mle maxSize];
 size.width = size.height;
 [mle setMaxSize:size];
 [scrollview setBorderType:NSBezelBorder];
 *       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];
+NSBox *border = [[[NSBox alloc] init] retain];
 NSTextField *textfield = dw_text_new(text, cid);
 #ifndef BUILDING_FOR_CATALINA
 [border setBorderType:NSGrooveBorder];
 #endif
 [border setTitlePosition:NSNoTitle];
 [border setContentView:textfield];
+[textfield release];
 [border setContentViewMargins:NSMakeSize(1.5,1.5)];
 [textfield autorelease];
 [textfield setBackgroundColor:[NSColor clearColor]];
 [[textfield cell] setVCenter:YES];
 return border;
 *       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_text_new(const char *text, ULONG cid)
 {
-DWText *textfield = [[DWText alloc] init];
+DWText *textfield = [[[DWText alloc] init] retain];
 [textfield setEditable:NO];
 [textfield setSelectable:NO];
 [textfield setBordered:NO];
 [textfield setDrawsBackground:NO];
 [textfield setStringValue:[ NSString stringWithUTF8String:text ]];
 * Returns:
 *       A handle to the widget or NULL on failure.
 */
 HWND API dw_render_new(unsigned long cid)
 {
-DWRender *render = [[DWRender alloc] init];
+DWRender *render = [[[DWRender alloc] init] retain];
 [render setTag:cid];
 return render;
 }
 /*
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_tree_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
 DW_FUNCTION_INIT;
-NSScrollView *scrollview  = [[NSScrollView alloc] init];
+NSScrollView *scrollview  = [[[NSScrollView alloc] init] retain];
 DWTree *tree = [[DWTree alloc] init];
 [tree setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 /* There isn't anything like quite like MDI on MacOS...
 * However we will make floating windows that hide
 * when the application is deactivated to simulate
 * similar behavior.
 */
-DWMDI *mdi = [[DWMDI alloc] init];
+DWMDI *mdi = [[[DWMDI alloc] init] retain];
 /* [mdi setTag:cid]; Why doesn't this work? */
 return mdi;
 }
 /*
 DW_FUNCTION_RETURN(dw_splitbar_new, HWND)
 DW_FUNCTION_RESTORE_PARAM4(type, int, topleft, HWND, bottomright, HWND, cid, unsigned long)
 {
 DW_FUNCTION_INIT;
 id tmpbox = dw_box_new(DW_VERT, 0);
-DWSplitBar *split = [[DWSplitBar alloc] init];
+DWSplitBar *split = [[[DWSplitBar alloc] init] retain];
 [split setDelegate:split];
 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
 [split addSubview:tmpbox];
+[tmpbox release];
 [tmpbox autorelease];
 tmpbox = dw_box_new(DW_VERT, 0);
 dw_box_pack_start(tmpbox, bottomright, 0, 0, TRUE, TRUE, 0);
 [split addSubview:tmpbox];
+[tmpbox release];
 [tmpbox autorelease];
 if(type == DW_VERT)
 {
 [split setVertical:NO];
 }
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_bitmap_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
 DW_FUNCTION_INIT;
-NSImageView *bitmap = [[NSImageView alloc] init];
+NSImageView *bitmap = [[[NSImageView alloc] init] retain];
 [bitmap setImageFrameStyle:NSImageFrameNone];
 [bitmap setImageScaling:NSImageScaleNone];
 [bitmap setEditable:NO];
 [bitmap setTag:cid];
 DW_FUNCTION_RETURN_THIS(bitmap);
 *       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_calendar_new(ULONG cid)
 {
-DWCalendar *calendar = [[DWCalendar alloc] init];
+DWCalendar *calendar = [[[DWCalendar alloc] init] retain];
 [calendar setDatePickerMode:DWDatePickerModeSingle];
 [calendar setDatePickerStyle:DWDatePickerStyleClockAndCalendar];
 [calendar setDatePickerElements:DWDatePickerElementFlagYearMonthDay];
 [calendar setTag:cid];
 [calendar setDateValue:[NSDate date]];
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_html_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(DW_UNUSED(cid), ULONG)
 {
 DW_FUNCTION_INIT;
-DWWebView *web = [[DWWebView alloc] init];
+DWWebView *web = [[[DWWebView alloc] init] retain];
 #if WK_API_ENABLED
 web.navigationDelegate = web;
 #else
 web.frameLoadDelegate = (id)web;
 #endif
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
 HWND API dw_notebook_new(ULONG cid, int top)
 {
-DWNotebook *notebook = [[DWNotebook alloc] init];
+DWNotebook *notebook = [[[DWNotebook alloc] init] retain];
 [notebook setDelegate:notebook];
 /* [notebook setTag:cid]; Why doesn't this work? */
 return notebook;
 }
 HWND tmpbox = dw_box_new(DW_VERT, 0);
 DWBox *box = tmpbox;
 dw_box_pack_start(tmpbox, page, 0, 0, TRUE, TRUE, 0);
 [notepage setView:box];
+[box release];
 [box autorelease];
 }
 }
 #ifndef NSWindowCollectionBehaviorFullScreenPrimary

Mercurial > dwindows

comparison mac/dw.m @ 2814:1b33d03568c4