dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1313:9f12bc79924b

Autorelease fixes for Mac allowing the objects to dealloc when destroyed.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 04 Nov 2011 12:30:23 +0000
parents	c5db6c70905c
children	c969db49606e

comparison

equal deleted inserted replaced

-:c5db6c70905c
+:9f12bc79924b
 * Parameters:
 *       exitcode: Exit code reported to the operating system.
 */
 void API dw_exit(int exitcode)
 {
+_dw_pool_drain();
 exit(exitcode);
 }
 /*
 * Free's memory allocated by dynamic windows.
 [groupbox setBorderType:NSBezelBorder];
 [groupbox setTitle:[NSString stringWithUTF8String:title]];
 box->grouphwnd = groupbox;
 [groupbox setContentView:thisbox];
+[thisbox autorelease];
 return groupbox;
 }
 /*
 * Create a new scrollable Box to be packed.
 [scrollbox setHasHorizontalScroller:YES];
 [scrollbox setBorderType:NSNoBorder];
 [scrollbox setDrawsBackground:NO];
 [scrollbox setBox:box];
 [scrollbox setDocumentView:tmpbox];
+[tmpbox autorelease];
 return scrollbox;
 }
 /*
 * Returns the position of the scrollbar in the scrollbox
 /* Update the item count */
 thisbox->count++;
 /* Add the item to the box */
 [view addSubview:this];
+/* Enable autorelease on the item...
+* so it will get destroyed when the parent is.
+*/
+[this autorelease];
 /* If we are packing a button... */
 if([this isMemberOfClass:[DWButton class]])
 {
 DWButton *button = (DWButton *)this;
 [stepper setTag:cid];
 [stepper setMinValue:-65536];
 [stepper setMaxValue:65536];
 [stepper setIntValue:atoi(text)];
 [textfield takeIntValueFrom:stepper];
+[stepper autorelease];
+[textfield autorelease];
 return spinbutton;
 }
 /*
 * Sets the spinbutton value.
 }
 [cont setDataSource:cont];
 [cont setDelegate:cont];
 [scrollview setDocumentView:cont];
 [cont setTag:cid];
+[cont autorelease];
 return cont;
 }
 /*
 * Create a new listbox window (widget) to be packed.
 [scrollview setAutohidesScrollers:YES];
 [scrollview setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
 [scrollview setDocumentView:mle];
 [mle setAutoresizingMask:NSViewWidthSizable];
 /* [mle setTag:cid]; Why doesn't this work? */
-[mle release];
+[mle autorelease];
 return scrollview;
 }
 /*
 * Adds text to an MLE box and returns the current point.
 [tree setDataSource:tree];
 [tree setDelegate:tree];
 [scrollview setDocumentView:tree];
 [tree setHeaderView:nil];
 [tree setTag:cid];
+[tree autorelease];
 DW_MUTEX_UNLOCK;
 return tree;
 }
 /*
 * Returns:
 *       A handle to a splitbar window or NULL on failure.
 */
 HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long cid)
 {
-HWND tmpbox = dw_box_new(DW_VERT, 0);
+id tmpbox = dw_box_new(DW_VERT, 0);
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 DWSplitBar *split = [[DWSplitBar alloc] init];
 [split setDelegate:split];
 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
 [split addSubview:tmpbox];
+[tmpbox autorelease];
 tmpbox = dw_box_new(DW_VERT, 0);
 dw_box_pack_start(tmpbox, bottomright, 0, 0, TRUE, TRUE, 0);
 [split addSubview:tmpbox];
+[tmpbox autorelease];
 if(type == DW_VERT)
 {
 [split setVertical:NO];
 }
 else
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
 HMENUI API dw_menu_new(ULONG cid)
 {
-NSMenu *menu = [[[NSMenu alloc] init] autorelease];
+NSMenu *menu = [[NSMenu alloc] init];
 [menu setAutoenablesItems:NO];
 /* [menu setTag:cid]; Why doesn't this work? */
 return menu;
 }
 NSView *view = [object isKindOfClass:[NSWindow class]] ? [object contentView] : parent;
 NSWindow *window = [view window];
 NSEvent *event = [DWApp currentEvent];
 if(!window)
 window = [event window];
+[thismenu autorelease];
 NSPoint p = NSMakePoint(x, [[NSScreen mainScreen] frame].size.height - y);
 NSEvent* fake = [NSEvent mouseEventWithType:NSRightMouseDown
 location:[window convertScreenToBase:p]
 modifierFlags:0
 timestamp:[event timestamp]
 accel[1] = 0;
 nstr = [ NSString stringWithUTF8String:newtitle ];
 free(newtitle);
-item = [[DWMenuItem alloc] initWithTitle:nstr
+item = [[[DWMenuItem alloc] initWithTitle:nstr
 action:@selector(menuHandler:)
-keyEquivalent:[ NSString stringWithUTF8String:accel ]];
+keyEquivalent:[ NSString stringWithUTF8String:accel ]] autorelease];
 [menu addItem:item];
 [item setTag:itemid];
 if(flags & DW_MIS_CHECKED)
 {
 }
 else
 {
 [notebook addTabViewItem:notepage];
 }
+[notepage autorelease];
 [notebook setPageid:(int)(page+1)];
 return (unsigned long)page;
 }
 /*
 id object = handle;
 /* Handle destroying a top-levle window */
 if([ object isKindOfClass:[ NSWindow class ] ])
 {
-NSWindow *window = handle;
+DWWindow *window = handle;
 [window close];
 }
 /* Handle destroying a control or box */
 else if([object isKindOfClass:[DWBox class]] || [object isKindOfClass:[DWGroupBox class]] || [object isKindOfClass:[NSControl class]])
 {

Mercurial > dwindows

comparison mac/dw.m @ 1313:9f12bc79924b