# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1300131036 0 # Node ID ecf47778caff975db2ea11b714ea2564ad1783f0 # Parent 4e09c92363df33cdcd7098126187437f69f43d92 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. diff -r 4e09c92363df -r ecf47778caff mac/dw.m --- 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();