dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1582:728778634933

Performed a more thorough audit of functions on Mac that require local pools. Added macros to these functions to hopefully reduce or eliminate leaks in apps that are threaded and perform GUI functions on secondary threads. _dw_pool_drain() is still available to drain the main thread pool, but enclosing the functions in these macros should reduce the objects accumulating in the thread's main pool.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 26 Jan 2012 05:26:40 +0000
parents	a51397ea24bf
children	021d2966f84d

comparison

equal deleted inserted replaced

-:a80ec948c3eb
+:728778634933
 {
 NSColor *color = [[NSColor colorWithDeviceRed: DW_RED_VALUE(value)/255.0 green: DW_GREEN_VALUE(value)/255.0 blue: DW_BLUE_VALUE(value)/255.0 alpha: 1] retain];
 /* Create the Color Chooser Dialog class. */
 static DWColorChoose *colorDlg = nil;
 DWDialog *dialog;
+DW_LOCAL_POOL_IN;
 if(colorDlg)
 {
 dialog = [colorDlg dialog];
 /* If someone is already waiting just return */
 if(dialog)
 {
+DW_LOCAL_POOL_OUT;
 return value;
 }
 }
 else
 {
 /* Figure out the value of what they returned */
 CGFloat red, green, blue;
 [color getRed:&red green:&green blue:&blue alpha:NULL];
 [color release];
 value = DW_RGB((int)(red * 255), (int)(green *255), (int)(blue *255));
+DW_LOCAL_POOL_OUT;
 return value;
 }
 /* Draw a point on a window (preferably a render window).
 * Parameters:
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 DWTree *tree = handle;
 NSMutableArray *array = (NSMutableArray *)item;
+DW_LOCAL_POOL_IN;
 if(title)
 {
 NSString *oldstr = [array objectAtIndex:1];
 NSString *nstr = [[NSString stringWithUTF8String:title] retain];
 [array replaceObjectAtIndex:1 withObject:nstr];
 if(icon)
 {
 [array replaceObjectAtIndex:0 withObject:icon];
 }
 [tree reloadData];
+DW_LOCAL_POOL_OUT;
 DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the item data of a tree item.
 *       text:  Text usually returned by dw_container_query().
 */
 void API dw_container_cursor(HWND handle, char *text)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 DWContainer *cont = handle;
 char *thistext;
 int x, count = (int)[cont numberOfRowsInTableView:cont];
 int textcomp = DW_POINTER_TO_INT(dw_window_get_data(handle, "_dw_textcomp"));
 [cont selectRowIndexes:selected byExtendingSelection:YES];
 [selected release];
 [cont scrollRowToVisible:x];
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Deletes the item with the text speficied.
 * Parameters:
 *       icon: Icon handle that was used with dw_taskbar_insert().
 */
 void API dw_taskbar_delete(HWND handle, HICN icon)
 {
 NSStatusItem *item = dw_window_get_data(handle, "_dw_taskbar");
+DW_LOCAL_POOL_IN;
 [item release];
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Obtains an icon from a module (or header in GTK).
 * Parameters:
 *          handle: Handle to icon returned by dw_icon_load().
 */
 void API dw_icon_free(HICN handle)
 {
 NSImage *image = handle;
+DW_LOCAL_POOL_IN;
 [image release];
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Create a new MDI Frame to be packed.
 * Parameters:
 {
 NSFont *font = _dw_font_by_name(fontname);
 if(font)
 {
+DW_LOCAL_POOL_IN;
 NSFont *oldfont = pixmap->font;
 [font retain];
 pixmap->font = font;
 if(oldfont)
 [oldfont release];
+DW_LOCAL_POOL_OUT;
 return DW_ERROR_NONE;
 }
 }
 return DW_ERROR_GENERAL;
 }
 {
 if(pixmap)
 {
 NSBitmapImageRep *image = (NSBitmapImageRep *)pixmap->image;
 NSFont *font = pixmap->font;
+DW_LOCAL_POOL_IN;
 [image release];
 [font release];
 free(pixmap);
+DW_LOCAL_POOL_OUT;
 }
 }
 /*
 * Copies from one item to another.
 void dw_calendar_set_date(HWND handle, unsigned int year, unsigned int month, unsigned int day)
 {
 DWCalendar *calendar = handle;
 NSDate *date;
 char buffer[101];
+DW_LOCAL_POOL_IN;
 snprintf(buffer, 100, "%04d-%02d-%02d 00:00:00 +0600", year, month, day);
 date = [[NSDate alloc] initWithString:[ NSString stringWithUTF8String:buffer ]];
 [calendar setDateValue:date];
 [date release];
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Gets the position of a splitbar (pecentage).
 * Parameters:
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
 void dw_calendar_get_date(HWND handle, unsigned int *year, unsigned int *month, unsigned int *day)
 {
 DWCalendar *calendar = handle;
+DW_LOCAL_POOL_IN;
 NSDate *date = [calendar dateValue];
 NSDateFormatter *df = [[NSDateFormatter alloc] init];
 [df setDateStyle:NSDateFormatterShortStyle];
 NSString *nstr = [df stringFromDate:date];
 sscanf([ nstr UTF8String ], "%d/%d/%d", month, day, year);
 else if(*year < 100)
 {
 *year += 1900;
 }
 [df release];
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Causes the embedded HTML widget to take action.
 * Parameters:
 *       menu: Handle of a menu.
 */
 void API dw_menu_destroy(HMENUI *menu)
 {
 NSMenu *thismenu = *menu;
+DW_LOCAL_POOL_IN;
 [thismenu release];
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Pops up a context menu at given x and y coordinates.
 * Parameters:
 */
 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid)
 {
 DWNotebook *notebook = handle;
 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DW_LOCAL_POOL_IN;
 if(notepage != nil)
 {
 [notebook removeTabViewItem:notepage];
 }
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Queries the currently visible page ID.
 * Parameters:
 *           handle: The window handle to destroy.
 */
 int API dw_window_destroy(HWND handle)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id object = handle;
 /* Handle destroying a top-level window */
 if([ object isKindOfClass:[ NSWindow class ] ])
 }
 if(index == -1)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return 0;
 }
 [object removeFromSuperview];
 free(thisitem);
 thisbox->count--;
 }
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return 0;
 }
 /*
 * Gets the text used for a given window.
 UInt32 start, end;
 if(!p)
 return result;
+DW_LOCAL_POOL_IN;
 /* Figure out the printer/paper size */
 pi = p->pi;
 size = [pi paperSize];
 /* Get the page range */
 [flipped release];
 dw_pixmap_destroy(pixmap);
 dw_pixmap_destroy(pixmap2);
 free(p);
 [iv release];
+DW_LOCAL_POOL_OUT;
 return result;
 }
 /*
 * Cancels the print job, typically called from a draw page callback.

Mercurial > dwindows

comparison mac/dw.m @ 1582:728778634933