Mercurial > dwindows
changeset 726:ecf47778caff
Possible fix for container string columns not showing correctly.
Also set the pool thread local storage for the main thread so _dw_pool_drain can be used.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 14 Mar 2011 19:30:36 +0000 |
parents | 4e09c92363df |
children | f190b5c2ce16 |
files | mac/dw.m |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/dw.m Mon Mar 14 18:26:50 2011 +0000 +++ b/mac/dw.m Mon Mar 14 19:30:36 2011 +0000 @@ -4240,7 +4240,8 @@ } else if(type & DW_CFA_STRING) { - object = [ NSString stringWithUTF8String:data ]; + char *str = *((char **)data); + object = [ NSString stringWithUTF8String:str ]; } else { @@ -4326,7 +4327,7 @@ void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon) { dw_container_change_item(handle, 0, row, &icon); - dw_container_change_item(handle, 1, row, filename); + dw_container_change_item(handle, 1, row, &filename); } /* @@ -4341,7 +4342,7 @@ void API dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon) { dw_container_set_item(handle, pointer, 0, row, &icon); - dw_container_set_item(handle, pointer, 1, row, filename); + dw_container_set_item(handle, pointer, 1, row, &filename); } /* @@ -7342,6 +7343,7 @@ #if !defined(GARBAGE_COLLECT) pthread_key_create(&_dw_pool_key, NULL); pool = [[NSAutoreleasePool alloc] init]; + pthread_setspecific(_dw_pool_key, pool); #endif /* Create a default main menu, with just the application menu */ DWMainMenu = _generate_main_menu();