Mercurial > dwindows
changeset 2447:8723c01fb87e
iOS: Fix bug in dw_pixmap_new_from_file(). Resources go into the app
directory on iOS it seems. Remove a couple debug messages in dwtest from
that last commit.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 09 Apr 2021 22:17:42 +0000 |
parents | b9d373d1ccf5 |
children | 7e1828dd4fe0 |
files | dwtest.c ios/dw.m |
diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dwtest.c Fri Apr 09 19:10:30 2021 +0000 +++ b/dwtest.c Fri Apr 09 22:17:42 2021 +0000 @@ -1159,7 +1159,6 @@ pos++; strncpy(&pathbuff[pos], "test", 1024-pos); image = dw_pixmap_new_from_file(textbox2, pathbuff); - dw_debug("PathBuff: %s\n", pathbuff); } if(image) dw_pixmap_set_transparent_color(image, DW_CLR_WHITE); @@ -2160,10 +2159,8 @@ pos++; strncpy(&pathbuff[pos], FOLDER_ICON_NAME, 1024-pos); foldericon = dw_icon_load_from_file(pathbuff); - dw_debug("PathBuff: %s\n", pathbuff); strncpy(&pathbuff[pos], FILE_ICON_NAME, 1024-pos); fileicon = dw_icon_load_from_file(pathbuff); - dw_debug("PathBuff: %s\n", pathbuff); } notebook = dw_notebook_new( 1, TRUE );
--- a/ios/dw.m Fri Apr 09 19:10:30 2021 +0000 +++ b/ios/dw.m Fri Apr 09 22:17:42 2021 +0000 @@ -6888,8 +6888,8 @@ } pixmap->width = [tmpimage size].width; pixmap->height = [tmpimage size].height; - pixmap->image = tmpimage; - pixmap->handle = [[DWImage alloc] initWithUIImage:tmpimage]; + pixmap->image = [[DWImage alloc] initWithUIImage:tmpimage]; + pixmap->handle = handle; DW_LOCAL_POOL_OUT; return pixmap; } @@ -10185,7 +10185,6 @@ if(len > 0) { strncpy(_dw_bundle_path, pathcopy, len + 4); - strcat(_dw_bundle_path, "/Contents/Resources"); } *app = 0;