dwindows: ios/dw.m annotate

annotate ios/dw.m @ 2830:cc9258ba53d7

iOS: Remimplement the label and image view in the custom cell. Using the built-in ones is apparently more trouble than it is worth.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 09 Sep 2022 08:42:22 +0000
parents	c543f7df7867
children	adb0e4ce9347

rev	line source
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 * Dynamic Windows:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3 * A GTK like implementation of the iOS GUI
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4 *
2751 ee1cfa7d645e Update copyright dates for the new year 2022. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2740 diff changeset	5 * (C) 2011-2022 Brian Smith <brian@dbsoft.org>
ee1cfa7d645e Update copyright dates for the new year 2022. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2740 diff changeset	6 * (C) 2011-2021 Mark Hessling <mark@rexx.org>
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7 * (C) 2017 Ralph Shane (Base tree view implementation)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8 *
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	9 * Requires 13.0 or later.
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10 * clang -g -o dwtest -D__IOS__ -I. dwtest.c ios/dw.m -framework UIKit -framework WebKit -framework Foundation -framework UserNotifications
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12 #import <Foundation/Foundation.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 #import <UIKit/UIKit.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	14 #import <WebKit/WebKit.h>
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	15 #import <AudioToolbox/AudioToolbox.h>
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 #import <UserNotifications/UserNotifications.h>
2712 ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	17 #import <UniformTypeIdentifiers/UTDefines.h>
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	18 #import <UniformTypeIdentifiers/UTType.h>
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	19 #import <UniformTypeIdentifiers/UTCoreTypes.h>
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20 #include "dw.h"
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21 #include <sys/utsname.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	22 #include <sys/socket.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	23 #include <sys/un.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	24 #include <sys/mman.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	25 #include <sys/time.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	26 #include <sys/stat.h>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	27 #include <math.h>
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	28 #include <spawn.h>
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	29
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	30 /* Macros to handle local auto-release pools */
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	31 #define DW_LOCAL_POOL_IN NSAutoreleasePool *localpool = nil; \
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	32 if(DWThread != (DWTID)-1 && pthread_self() != DWThread) \
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	33 localpool = [[NSAutoreleasePool alloc] init];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	34 #define DW_LOCAL_POOL_OUT if(localpool) [localpool drain];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	35
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	36 /* Macros to encapsulate running functions on the main thread */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	37 #define DW_FUNCTION_INIT
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	38 #define DW_FUNCTION_DEFINITION(func, rettype, ...) void _##func(NSPointerArray *_args); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	39 rettype API func(__VA_ARGS__) { \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	40 DW_LOCAL_POOL_IN; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	41 NSPointerArray *_args = [[NSPointerArray alloc] initWithOptions:NSPointerFunctionsOpaqueMemory]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	42 [_args addPointer:(void *)_##func];
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	43 #define DW_FUNCTION_ADD_PARAM1(param1) [_args addPointer:(void *)&param1]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	44 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	45 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	46 #define DW_FUNCTION_ADD_PARAM2(param1, param2) [_args addPointer:(void *)&param1]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	47 [_args addPointer:(void *)&param2]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	48 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	49 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	50 #define DW_FUNCTION_ADD_PARAM3(param1, param2, param3) [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	51 [_args addPointer:(void *)&param2]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	52 [_args addPointer:(void *)&param3]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	53 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	54 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	55 #define DW_FUNCTION_ADD_PARAM4(param1, param2, param3, param4) [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	56 [_args addPointer:(void *)&param2]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	57 [_args addPointer:(void *)&param3]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	58 [_args addPointer:(void *)&param4]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	59 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	60 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	61 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5) [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	62 [_args addPointer:(void *)&param2]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	63 [_args addPointer:(void *)&param3]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	64 [_args addPointer:(void *)&param4]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	65 [_args addPointer:(void *)&param5]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	66 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	67 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	68 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	69 [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	70 [_args addPointer:(void *)&param2]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	71 [_args addPointer:(void *)&param3]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	72 [_args addPointer:(void *)&param4]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	73 [_args addPointer:(void *)&param5]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	74 [_args addPointer:(void *)&param6]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	75 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	76 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	77 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	78 [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	79 [_args addPointer:(void *)&param2]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	80 [_args addPointer:(void *)&param3]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	81 [_args addPointer:(void *)&param4]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	82 [_args addPointer:(void *)&param5]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	83 [_args addPointer:(void *)&param6]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	84 [_args addPointer:(void *)&param7]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	85 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	86 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	87 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	88 [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	89 [_args addPointer:(void *)&param2]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	90 [_args addPointer:(void *)&param3]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	91 [_args addPointer:(void *)&param4]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	92 [_args addPointer:(void *)&param5]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	93 [_args addPointer:(void *)&param6]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	94 [_args addPointer:(void *)&param7]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	95 [_args addPointer:(void *)&param8]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	96 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	97 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	98 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	99 [_args addPointer:(void *)&param1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	100 [_args addPointer:(void *)&param2]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	101 [_args addPointer:(void *)&param3]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	102 [_args addPointer:(void *)&param4]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	103 [_args addPointer:(void *)&param5]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	104 [_args addPointer:(void *)&param6]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	105 [_args addPointer:(void *)&param7]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	106 [_args addPointer:(void *)&param8]; \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	107 [_args addPointer:(void *)&param9]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	108 [_args addPointer:(void *)pthread_getspecific(_dw_fg_color_key)]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	109 [_args addPointer:(void *)pthread_getspecific(_dw_bg_color_key)];
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	110 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1) \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	111 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	112 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:2]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	113 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:3];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	114 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	115 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	116 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	117 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:3]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	118 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:4];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	119 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	120 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	121 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	122 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	123 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:4]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	124 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:5];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	125 #define DW_FUNCTION_RESTORE_PARAM4(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	126 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	127 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	128 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	129 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	130 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:5]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	131 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:6];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	132 #define DW_FUNCTION_RESTORE_PARAM5(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	133 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	134 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	135 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	136 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	137 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	138 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:6]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	139 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:7];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	140 #define DW_FUNCTION_RESTORE_PARAM6(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	141 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	142 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	143 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	144 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	145 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	146 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	147 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:7]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	148 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:8];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	149 #define DW_FUNCTION_RESTORE_PARAM7(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	150 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	151 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	152 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	153 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	154 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	155 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	156 vartype7 param7 = ((vartype7 )[_args pointerAtIndex:7]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	157 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:8]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	158 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:9];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	159 #define DW_FUNCTION_RESTORE_PARAM8(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	160 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	161 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	162 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	163 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	164 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	165 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	166 vartype7 param7 = ((vartype7 )[_args pointerAtIndex:7]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	167 vartype8 param8 = ((vartype8 )[_args pointerAtIndex:8]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	168 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:9]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	169 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:10];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	170 #define DW_FUNCTION_RESTORE_PARAM9(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9) \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	171 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	172 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	173 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	174 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	175 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	176 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	177 vartype7 param7 = ((vartype7 )[_args pointerAtIndex:7]); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	178 vartype8 param8 = ((vartype8 )[_args pointerAtIndex:8]); \
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	179 vartype9 param9 = ((vartype9 )[_args pointerAtIndex:9]); \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	180 UIColor __attribute__((__unused__))_dw_fg_color = (UIColor )[_args pointerAtIndex:10]; \
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	181 UIColor __attribute__((__unused__))_dw_bg_color = (UIColor )[_args pointerAtIndex:11];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	182 #define DW_FUNCTION_END }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	183 #define DW_FUNCTION_NO_RETURN(func) [DWObj safeCall:@selector(callBack:) withObject:_args]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	184 [_args release]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	185 DW_LOCAL_POOL_OUT; } \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	186 void _##func(NSPointerArray *_args) {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	187 #define DW_FUNCTION_RETURN(func, rettype) [DWObj safeCall:@selector(callBack:) withObject:_args]; {\
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	188 void *tmp = [_args pointerAtIndex:[_args count]-1]; \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	189 rettype myreturn = ((rettype )tmp); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	190 free(tmp); \
2813 9c9b680f7772 Mac/iOS: Fix a memory leak when calling API functions that return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2807 diff changeset	191 [_args release]; \
9c9b680f7772 Mac/iOS: Fix a memory leak when calling API functions that return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2807 diff changeset	192 DW_LOCAL_POOL_OUT; \
9c9b680f7772 Mac/iOS: Fix a memory leak when calling API functions that return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2807 diff changeset	193 return myreturn; }} \
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	194 void _##func(NSPointerArray *_args) {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	195 #define DW_FUNCTION_RETURN_THIS(_retvar) { void *_myreturn = malloc(sizeof(_retvar)); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	196 memcpy(_myreturn, (void *)&_retvar, sizeof(_retvar)); \
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	197 [_args addPointer:_myreturn]; }}
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	198 #define DW_FUNCTION_RETURN_NOTHING }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	199
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	200 unsigned long _dw_colors[] =
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	201 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	202 0x00000000, /* 0 black */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	203 0x000000bb, /* 1 red */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	204 0x0000bb00, /* 2 green */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	205 0x0000aaaa, /* 3 yellow */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	206 0x00cc0000, /* 4 blue */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	207 0x00bb00bb, /* 5 magenta */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	208 0x00bbbb00, /* 6 cyan */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	209 0x00bbbbbb, /* 7 white */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	210 0x00777777, /* 8 grey */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	211 0x000000ff, /* 9 bright red */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	212 0x0000ff00, /* 10 bright green */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	213 0x0000eeee, /* 11 bright yellow */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	214 0x00ff0000, /* 12 bright blue */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	215 0x00ff00ff, /* 13 bright magenta */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	216 0x00eeee00, /* 14 bright cyan */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	217 0x00ffffff, /* 15 bright white */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	218 0xff000000 /* 16 default color */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	219 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	220
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	221 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	222 * List those icons that have transparency first
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	223 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	224 #define NUM_EXTS 8
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	225 char *_dw_image_exts[NUM_EXTS+1] =
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	226 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	227 ".png",
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	228 ".ico",
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	229 ".icns",
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	230 ".gif",
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	231 ".jpg",
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	232 ".jpeg",
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	233 ".tiff",
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	234 ".bmp",
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	235 NULL
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	236 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	237
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	238 char _dw_get_image_extension(const char filename)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	239 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	240 char *file = alloca(strlen(filename) + 6);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	241 int found_ext = 0,i;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	242
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	243 /* Try various extentions */
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	244 for(i = 0; i < NUM_EXTS; i++)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	245 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	246 strcpy(file, filename);
353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	247 strcat(file, _dw_image_exts[i]);
353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	248 if(access(file, R_OK ) == 0)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	249 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	250 found_ext = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	251 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	252 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	253 }
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	254 if(found_ext == 1)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	255 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	256 return _dw_image_exts[i];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	257 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	258 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	259 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	260
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	261 /* Return the RGB color regardless if a predefined color was passed */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	262 unsigned long _dw_get_color(unsigned long thiscolor)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	263 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	264 if(thiscolor & DW_RGB_COLOR)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	265 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	266 return thiscolor & ~DW_RGB_COLOR;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	267 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	268 else if(thiscolor < 17)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	269 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	270 return _dw_colors[thiscolor];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	271 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	272 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	273 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	274
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	275 /* Thread specific storage */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	276 pthread_key_t _dw_pool_key;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	277 pthread_key_t _dw_fg_color_key;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	278 pthread_key_t _dw_bg_color_key;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	279 static int DWOSMajor, DWOSMinor, DWOSBuild;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	280 static char _dw_bundle_path[PATH_MAX+1] = { 0 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	281 static char _dw_app_id[_DW_APP_ID_SIZE+1]= {0};
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	282 static int _dw_dark_mode_state = DW_FEATURE_UNSUPPORTED;
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	283 static int _dw_container_mode = DW_CONTAINER_MODE_DEFAULT;
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	284 static CGPoint _dw_event_point = {0};
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	285 static NSMutableArray *_dw_toplevel_windows;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	286
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	287 /* Create a default colors for a thread */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	288 void _dw_init_colors(void)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	289 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	290 UIColor *fgcolor = [[UIColor grayColor] retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	291 pthread_setspecific(_dw_fg_color_key, fgcolor);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	292 pthread_setspecific(_dw_bg_color_key, NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	293 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	294
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	295 typedef struct _dwsighandler
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	296 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	297 struct _dwsighandler *next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	298 ULONG message;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	299 HWND window;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	300 int id;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	301 void *signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	302 void *discfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	303 void *data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	304
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	305 } DWSignalHandler;
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	306
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	307 static DWSignalHandler *DWRoot = NULL;
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	308
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	309 /* Some internal prototypes */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	310 static void _dw_do_resize(Box *thisbox, int x, int y);
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	311 void _dw_handle_resize_events(Box *thisbox);
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	312 int _dw_remove_userdata(UserData *root, const char varname, int all);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	313 int _dw_main_iteration(NSDate *date);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	314 CGContextRef _dw_draw_context(id image, bool antialias);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	315 typedef id (*DWIMP)(id, SEL, ...);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	316
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	317 /* Internal function to queue a window redraw */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	318 void _dw_redraw(id window, int skip)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	319 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	320 static id lastwindow = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	321 id redraw = lastwindow;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	322
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	323 if(skip && window == nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	324 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	325
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	326 lastwindow = window;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	327 if(redraw != lastwindow && redraw != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	328 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	329 dw_window_redraw(redraw);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	330 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	331 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	332
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	333 DWSignalHandler *_dw_get_handler(HWND window, int messageid)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	334 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	335 DWSignalHandler *tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	336
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	337 /* Find any callbacks for this function */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	338 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	339 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	340 if(tmp->message == messageid && window == tmp->window)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	341 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	342 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	343 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	344 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	345 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	346 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	347 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	348
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	349 typedef struct
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	350 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	351 ULONG message;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	352 char name[30];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	353
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	354 } DWSignalList;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	355
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	356 /* List of signals */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	357 #define SIGNALMAX 19
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	358
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	359 static DWSignalList DWSignalTranslate[SIGNALMAX] = {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	360 { _DW_EVENT_CONFIGURE, DW_SIGNAL_CONFIGURE },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	361 { _DW_EVENT_KEY_PRESS, DW_SIGNAL_KEY_PRESS },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	362 { _DW_EVENT_BUTTON_PRESS, DW_SIGNAL_BUTTON_PRESS },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	363 { _DW_EVENT_BUTTON_RELEASE, DW_SIGNAL_BUTTON_RELEASE },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	364 { _DW_EVENT_MOTION_NOTIFY, DW_SIGNAL_MOTION_NOTIFY },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	365 { _DW_EVENT_DELETE, DW_SIGNAL_DELETE },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	366 { _DW_EVENT_EXPOSE, DW_SIGNAL_EXPOSE },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	367 { _DW_EVENT_CLICKED, DW_SIGNAL_CLICKED },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	368 { _DW_EVENT_ITEM_ENTER, DW_SIGNAL_ITEM_ENTER },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	369 { _DW_EVENT_ITEM_CONTEXT, DW_SIGNAL_ITEM_CONTEXT },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	370 { _DW_EVENT_LIST_SELECT, DW_SIGNAL_LIST_SELECT },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	371 { _DW_EVENT_ITEM_SELECT, DW_SIGNAL_ITEM_SELECT },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	372 { _DW_EVENT_SET_FOCUS, DW_SIGNAL_SET_FOCUS },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	373 { _DW_EVENT_VALUE_CHANGED, DW_SIGNAL_VALUE_CHANGED },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	374 { _DW_EVENT_SWITCH_PAGE, DW_SIGNAL_SWITCH_PAGE },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	375 { _DW_EVENT_TREE_EXPAND, DW_SIGNAL_TREE_EXPAND },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	376 { _DW_EVENT_COLUMN_CLICK, DW_SIGNAL_COLUMN_CLICK },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	377 { _DW_EVENT_HTML_RESULT, DW_SIGNAL_HTML_RESULT },
07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	378 { _DW_EVENT_HTML_CHANGED, DW_SIGNAL_HTML_CHANGED }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	379 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	380
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	381 int _dw_event_handler1(id object, id event, int message)
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	382 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	383 DWSignalHandler *handler = _dw_get_handler(object, message);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	384 /* NSLog(@"Event handler - type %d\n", message); */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	385
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	386 if(handler)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	387 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	388 switch(message)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	389 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	390 /* Timer event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	391 case _DW_EVENT_TIMER:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	392 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	393 int (* API timerfunc)(void ) = (int ( API)(void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	394
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	395 if(!timerfunc(handler->data))
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	396 dw_timer_disconnect(handler->window);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	397 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	398 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	399 /* Configure/Resize event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	400 case _DW_EVENT_CONFIGURE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	401 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	402 int (sizefunc)(HWND, int, int, void ) = handler->signalfunction;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	403 CGSize size;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	404
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	405 if([object isKindOfClass:[UIWindow class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	406 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	407 UIWindow *window = object;
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	408 size = [window frame].size;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	409 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	410 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	411 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	412 UIView *view = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	413 size = [view frame].size;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	414 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	415
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	416 if(size.width > 0 && size.height > 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	417 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	418 return sizefunc(object, size.width, size.height, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	419 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	420 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	421 }
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	422 case _DW_EVENT_KEY_PRESS:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	423 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	424 int (keypressfunc)(HWND, char, int, int, void , char *) = handler->signalfunction;
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	425 int special = 0;
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	426 NSString *nchar = @"";
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	427 if (@available(iOS 13.4, *)) {
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	428 UIKey *key = event;
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	429
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	430 nchar = [key charactersIgnoringModifiers];
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	431 special = (int)[key modifierFlags];
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	432 } else {
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	433 // Probably won't even get here if not 13.4
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	434 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	435 unichar vk = [nchar characterAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	436 char *utf8 = NULL, ch = '\0';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	437
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	438 /* Handle a valid key */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	439 if([nchar length] == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	440 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	441 char tmp = (char )[nchar UTF8String];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	442 if(tmp && strlen(tmp) == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	443 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	444 ch = tmp[0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	445 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	446 utf8 = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	447 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	448
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	449 return keypressfunc(handler->window, ch, (int)vk, special, handler->data, utf8);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	450 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	451 /* Button press and release event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	452 case _DW_EVENT_BUTTON_PRESS:
4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	453 case _DW_EVENT_BUTTON_RELEASE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	454 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	455 int (* API buttonfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	456 /* Event will be nil when handling the context menu events...
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	457 * So button should default to 2 if event is nil
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	458 */
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	459 int button = event ? 1 : 2;
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	460 CGPoint p = _dw_event_point;
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	461
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	462 if(event && [event isKindOfClass:[UIEvent class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	463 {
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	464 NSSet *touches = [event allTouches];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	465
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	466 for(id touch in touches)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	467 {
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	468 if((message == 3 && [touch phase] == UITouchPhaseBegan) \|\|
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	469 (message == 4 && [touch phase] == UITouchPhaseEnded))
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	470 {
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	471 p = [touch locationInView:[touch view]];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	472
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	473 if(@available(ios 13.4, *))
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	474 {
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	475 if([event buttonMask] & UIEventButtonMaskSecondary)
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	476 button = 2;
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	477 }
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	478 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	479 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	480 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	481
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	482 return buttonfunc(object, (int)p.x, (int)p.y, button, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	483 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	484 /* Motion notify event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	485 case _DW_EVENT_MOTION_NOTIFY:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	486 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	487 int (* API motionfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	488 int button = 1;
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	489
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	490 if(event && [event isKindOfClass:[UIEvent class]])
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	491 {
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	492 NSSet *touches = [event allTouches];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	493
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	494 for(id touch in touches)
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	495 {
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	496 if([touch phase] == UITouchPhaseMoved)
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	497 {
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	498 CGPoint p = [touch locationInView:[touch view]];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	499
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	500 return motionfunc(object, (int)p.x, (int)p.y, button, handler->data);
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	501 }
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	502 }
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	503 }
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	504 return -1;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	505 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	506 /* Window close event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	507 case _DW_EVENT_DELETE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	508 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	509 int (* API closefunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	510 return closefunc(object, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	511 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	512 /* Window expose/draw event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	513 case _DW_EVENT_EXPOSE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	514 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515 DWExpose exp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	516 int (* API exposefunc)(HWND, DWExpose , void ) = (int (* API)(HWND, DWExpose , void ))handler->signalfunction;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	517 CGRect rect = [object frame];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	518
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	519 exp.x = rect.origin.x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	520 exp.y = rect.origin.y;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	521 exp.width = rect.size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	522 exp.height = rect.size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	523 int result = exposefunc(object, &exp, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	524 return result;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	525 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	526 /* Clicked event for buttons and menu items */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	527 case _DW_EVENT_CLICKED:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	528 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	529 int (* API clickfunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	530
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	531 return clickfunc(object, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	532 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	533 /* Container class selection event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	534 case _DW_EVENT_ITEM_ENTER:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	535 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	536 int (containerselectfunc)(HWND, char , void , void ) = handler->signalfunction;
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	537
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	538 return containerselectfunc(handler->window, [event pointerAtIndex:0], handler->data,
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	539 [event pointerAtIndex:1]);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	540 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	541 /* Container context menu event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	542 case _DW_EVENT_ITEM_CONTEXT:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	543 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	544 int (* API containercontextfunc)(HWND, char , int, int, void , void ) = (int ( API)(HWND, char , int, int, void , void *))handler->signalfunction;
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	545 char text = (char )[event pointerAtIndex:0];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	546 void *user = [event pointerAtIndex:1];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	547 int x = DW_POINTER_TO_INT([event pointerAtIndex:2]);
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	548 int y = DW_POINTER_TO_INT([event pointerAtIndex:3]);
2467 4d1f370bf65e iOS: Pass in the coordinates and row data on container context event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2464 diff changeset	549
4d1f370bf65e iOS: Pass in the coordinates and row data on container context event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2464 diff changeset	550 return containercontextfunc(handler->window, text, x, y, handler->data, user);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	551 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	552 /* Generic selection changed event for several classes */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	553 case _DW_EVENT_LIST_SELECT:
4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	554 case _DW_EVENT_VALUE_CHANGED:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	555 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	556 int (* API valuechangedfunc)(HWND, int, void ) = (int ( API)(HWND, int, void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	557 int selected = DW_POINTER_TO_INT(event);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	558
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	559 return valuechangedfunc(handler->window, selected, handler->data);;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	560 }
2429 89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	561 /* Tree class selection event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	562 case _DW_EVENT_ITEM_SELECT:
2429 89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	563 {
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	564 int (* API treeselectfunc)(HWND, HTREEITEM, char , void , void ) = (int ( API)(HWND, HTREEITEM, char , void , void *))handler->signalfunction;
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	565 char *text = NULL;
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	566 void *user = NULL;
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	567 id item = nil;
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	568
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	569 if([object isKindOfClass:[UITableView class]] && event)
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	570 {
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	571 if([event isKindOfClass:[NSPointerArray class]])
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	572 {
2772 af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	573 /* The NSPointerArray count will be 2 for Containers */
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	574 text = [event pointerAtIndex:0];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	575 user = [event pointerAtIndex:1];
2772 af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	576
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	577 /* The NSPointerArray count will be 3 for Trees */
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	578 if([event count] > 2)
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	579 item = [event pointerAtIndex:2];
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	580 }
2429 89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	581 }
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	582
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	583 return treeselectfunc(handler->window, item, text, handler->data, user);
89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	584 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	585 /* Set Focus event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	586 case _DW_EVENT_SET_FOCUS:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	587 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	588 int (* API setfocusfunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	589
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	590 return setfocusfunc(handler->window, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	591 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	592 /* Notebook page change event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	593 case _DW_EVENT_SWITCH_PAGE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	594 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	595 int (* API switchpagefunc)(HWND, unsigned long, void ) = (int ( API)(HWND, unsigned long, void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	596 int pageid = DW_POINTER_TO_INT(event);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	597
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	598 return switchpagefunc(handler->window, pageid, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	599 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	600 /* Tree expand event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	601 case _DW_EVENT_TREE_EXPAND:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	602 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	603 int (* API treeexpandfunc)(HWND, HTREEITEM, void ) = (int ( API)(HWND, HTREEITEM, void *))handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	604
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	605 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	606 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	607 /* Column click event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	608 case _DW_EVENT_COLUMN_CLICK:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	609 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	610 int (* API clickcolumnfunc)(HWND, int, void *) = handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	611 int column_num = DW_POINTER_TO_INT(event);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	612
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	613 return clickcolumnfunc(handler->window, column_num, handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	614 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	615 /* HTML result event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	616 case _DW_EVENT_HTML_RESULT:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	617 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	618 int (* API htmlresultfunc)(HWND, int, char , void , void *) = handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	619 void params = (void )event;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	620 NSString *result = params[0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	621
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	622 return htmlresultfunc(handler->window, [result length] ? DW_ERROR_NONE : DW_ERROR_UNKNOWN, [result length] ? (char *)[result UTF8String] : NULL, params[1], handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	623 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	624 /* HTML changed event */
2764 4c602db2d2cf iOS: _dw_event_handler() switch needs to be updated using internal constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	625 case _DW_EVENT_HTML_CHANGED:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	626 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	627 int (* API htmlchangedfunc)(HWND, int, char , void ) = handler->signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	628 void params = (void )event;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	629 NSString *uri = params[1];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	630
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	631 return htmlchangedfunc(handler->window, DW_POINTER_TO_INT(params[0]), (char *)[uri UTF8String], handler->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	632 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	633 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	634 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	635 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	636 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	637
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	638 /* Sub function to handle redraws */
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	639 int _dw_event_handler(id object, id event, int message)
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	640 {
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	641 int ret = _dw_event_handler1(object, event, message);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	642 if(ret != -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	643 _dw_redraw(nil, FALSE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	644 return ret;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	645 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	646
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	647 /* Subclass for the Timer type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	648 @interface DWTimerHandler : NSObject { }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	649 -(void)runTimer:(id)sender;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	650 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	651
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	652 @implementation DWTimerHandler
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	653 -(void)runTimer:(id)sender { _dw_event_handler(sender, nil, _DW_EVENT_TIMER); }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	654 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	655
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	656 @interface DWAppDel : UIResponder <UIApplicationDelegate> { }
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	657 -(void)applicationWillTerminate:(UIApplication *)application;
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	658 -(BOOL)application:(UIApplication )application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id> )launchOptions;
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	659 @end
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	660
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	661 @implementation DWAppDel
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	662 -(void)applicationWillTerminate:(UIApplication *)application
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	663 {
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	664 /* On iOS we can't prevent temrination, but send the notificatoin anyway */
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	665 _dw_event_handler(application, nil, _DW_EVENT_DELETE);
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	666 }
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	667 -(BOOL)application:(UIApplication )application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id> )launchOptions
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	668 {
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	669 return true;
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	670 }
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	671 @end
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	672
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	673 static UIApplication *DWApp = nil;
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	674 static UIFont *DWDefaultFont;
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	675 static DWTimerHandler *DWHandler;
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	676 static NSMutableArray *_DWDirtyDrawables;
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	677 static DWTID DWThread = (DWTID)-1;
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	678 static HEV DWMainEvent;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	679
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	680 /* Used for doing bitblts from the main thread */
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	681 typedef struct _dw_bitbltinfo
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	682 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	683 id src;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	684 id dest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	685 int xdest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	686 int ydest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	687 int width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	688 int height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689 int xsrc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	690 int ysrc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	691 int srcwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	692 int srcheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	693 } DWBitBlt;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	694
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	695 /* Subclass for a test object type */
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	696 @interface DWObject : NSObject
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	697 {
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	698 /* A normally hidden window, at the top of the view hierarchy.
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	699 * Since iOS messageboxes and such require a view controller,
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	700 * we show this hidden window when necessary and use it during
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	701 * the creation of alerts and dialog boxes that don't have one.
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	702 */
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	703 UIWindow *hiddenWindow;
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	704 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	705 -(void)uselessThread:(id)sender;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	706 -(void)menuHandler:(id)param;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	707 -(void)doBitBlt:(id)param;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	708 -(void)doFlush:(id)param;
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	709 -(UIWindow *)hiddenWindow;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	710 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	711
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	712 API_AVAILABLE(ios(13.0))
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	713 @interface DWMenu : NSObject
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	714 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	715 UIMenu *menu;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	716 NSMutableArray *children;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	717 NSString *title;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	718 unsigned long tag;
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	719 UIWindow *window;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	720 }
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	721 -(id)initWithTag:(unsigned long)newtag;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	722 -(void)setTitle:(NSString *)input;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	723 -(UIMenu *)menu;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	724 -(unsigned long)tag;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	725 -(id)childWithTag:(unsigned long)tag;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	726 -(void)addItem:(id)item;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	727 -(void)removeItem:(id)item;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	728 -(void)dealloc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	729 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	730
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	731 API_AVAILABLE(ios(13.0))
2604 4671ac4ad3c6 iOS: Had to switch from UIKeyCommand to UIAction for DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2603 diff changeset	732 @interface DWMenuItem : UIAction
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	733 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	734 BOOL check, enabled;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	735 unsigned long tag;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	736 DWMenu submenu, menu;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	737 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	738 -(void)setCheck:(BOOL)input;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	739 -(void)setEnabled:(BOOL)input;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	740 -(void)setTag:(unsigned long)input;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	741 -(void)setSubmenu:(DWMenu *)input;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	742 -(void)setMenu:(DWMenu *)input;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	743 -(DWMenu *)submenu;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	744 -(DWMenu *)menu;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	745 -(BOOL)check;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	746 -(BOOL)enabled;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	747 -(unsigned long)tag;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	748 -(void)dealloc;
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	749 @end
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	750
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	751 /* So basically to implement our event handlers...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	752 * it looks like we are going to have to subclass
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	753 * basically everything. Was hoping to add methods
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	754 * to the superclasses but it looks like you can
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	755 * only add methods and no variables, which isn't
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	756 * going to work. -Brian
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	757 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	758
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	759 /* Subclass for a box type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	760 @interface DWBox : UIView
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	761 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	762 Box *box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	763 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	764 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	765 -(id)init;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	766 -(void)dealloc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	767 -(Box *)box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	768 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	769 -(void)setUserdata:(void *)input;
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	770 -(void)keyDown:(UIKey *)key API_AVAILABLE(ios(13.4));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	771 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	772
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	773 @implementation DWBox
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	774 -(id)init
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	775 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	776 self = [super init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	777
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	778 if (self)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	779 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	780 box = calloc(1, sizeof(Box));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	781 box->type = DW_VERT;
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	782 box->vsize = box->hsize = _DW_SIZE_EXPAND;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783 box->width = box->height = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	784 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	785 return self;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	786 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	787 -(void)dealloc
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	788 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	789 UserData *root = userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	790 if(box->items)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	791 free(box->items);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	792 free(box);
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	793 _dw_remove_userdata(&root, NULL, TRUE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	794 dw_signal_disconnect_by_window(self);
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	795 for(id object in [self subviews])
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	796 {
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	797 NSUInteger rc = [object retainCount];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	798 [object removeFromSuperview];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	799 /* TODO: Fix the cause of this...
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	800 * DWButtons have a lower retain count than the other widgets...
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	801 * so this release causes a crash. Figure out why it is lower...
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	802 * and make the others that way too.
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	803 */
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	804 if(rc > 2)
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	805 [object release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	806 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	807 [super dealloc];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	808 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	809 -(Box *)box { return box; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	810 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	811 -(void)setUserdata:(void *)input { userdata = input; }
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	812 -(void)keyDown:(UIKey *)key API_AVAILABLE(ios(13.4)){ _dw_event_handler(self, key, _DW_EVENT_KEY_PRESS); }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	813 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	814
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	815 @interface DWWindow : UIWindow
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	816 {
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	817 DWMenu windowmenu, popupmenu;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	818 int shown;
2739 02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	819 void *userdata;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	820 }
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	821 -(void)sendEvent:(UIEvent *)theEvent;
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	822 -(void)keyDown:(UIKey *)key API_AVAILABLE(ios(13.4));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	823 -(int)shown;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	824 -(void)setShown:(int)val;
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	825 -(void)layoutSubviews;
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	826 -(void)setMenu:(DWMenu *)input;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	827 -(void)setPopupMenu:(DWMenu *)input;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	828 -(DWMenu *)menu;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	829 -(DWMenu *)popupMenu;
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	830 -(void)updateMenu;
2739 02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	831 -(void *)userdata;
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	832 -(void)setUserdata:(void *)input;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	833 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	834
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	835 @implementation DWWindow
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	836 -(void)sendEvent:(UIEvent *)theEvent
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	837 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	838 int rcode = -1;
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	839 if([theEvent type] == UIEventTypePresses)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	840 {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	841 rcode = _dw_event_handler(self, theEvent, _DW_EVENT_KEY_PRESS);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	842 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	843 if ( rcode != TRUE )
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	844 [super sendEvent:theEvent];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	845 }
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	846 -(void)keyDown:(UIKey *)key { }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	847 -(int)shown { return shown; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	848 -(void)setShown:(int)val { shown = val; }
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	849 -(void)layoutSubviews { }
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	850 -(void)setMenu:(DWMenu *)input { [windowmenu release]; windowmenu = input; [windowmenu retain]; }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	851 -(void)setPopupMenu:(DWMenu *)input { [popupmenu release]; popupmenu = input; [popupmenu retain]; }
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	852 -(void)updateMenu
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	853 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	854 if(windowmenu)
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	855 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	856 NSArray *array = [[[self rootViewController] view] subviews];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	857 UINavigationBar *nav = nil;
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	858
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	859 for(id obj in array)
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	860 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	861 if([obj isMemberOfClass:[UINavigationBar class]])
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	862 nav = obj;
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	863 }
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	864 if(nav)
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	865 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	866 UINavigationItem *item = [[nav items] firstObject];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	867
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	868 if (@available(iOS 14.0, *)) {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	869 if(item && item.rightBarButtonItem && item.rightBarButtonItem.menu)
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	870 [item.rightBarButtonItem setMenu:[windowmenu menu]];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	871 }
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	872 }
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	873 }
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	874 }
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	875 -(DWMenu *)menu { return windowmenu; }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	876 -(DWMenu *)popupMenu { return popupmenu; }
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	877 -(void)closeWindow:(id)sender
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	878 {
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	879 if(_dw_event_handler(self, nil, _DW_EVENT_DELETE) < 1)
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	880 dw_window_destroy(self);
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	881 }
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	882 -(void)dealloc
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	883 {
2739 02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	884 UserData *root = userdata;
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	885 _dw_remove_userdata(&root, NULL, TRUE);
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	886 if(windowmenu)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	887 [windowmenu release];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	888 if(popupmenu)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	889 [popupmenu release];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	890 dw_signal_disconnect_by_window(self);
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	891 [super dealloc];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	892 }
2739 02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	893 -(void *)userdata { return userdata; }
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	894 -(void)setUserdata:(void *)input { userdata = input; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	895 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	896
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	897 @interface DWImage : NSObject
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	898 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	899 UIImage *image;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	900 CGContextRef cgcontext;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	901 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	902 -(id)initWithSize:(CGSize)size;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	903 -(id)initWithCGImage:(CGImageRef)cgimage;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	904 -(id)initWithUIImage:(UIImage *)newimage;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	905 -(void)setImage:(UIImage *)input;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	906 -(UIImage *)image;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	907 -(CGContextRef)cgcontext;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	908 -(void)dealloc;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	909 @end
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	910
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911 /* Subclass for a render area type */
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	912 @interface DWRender : UIView <UIContextMenuInteractionDelegate>
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	913 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	914 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	915 UIFont *font;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	916 CGSize size;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	917 DWImage *cachedImage;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	918 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	919 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	920 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	921 -(void)setFont:(UIFont *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	922 -(UIFont *)font;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	923 -(void)setSize:(CGSize)input;
8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	924 -(CGSize)size;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	925 -(DWImage *)cachedImage;
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	926 -(void)keyDown:(UIKey *)key API_AVAILABLE(ios(13.4));
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	927 -(UIContextMenuConfiguration )contextMenuInteraction:(UIContextMenuInteraction )interaction configurationForMenuAtLocation:(CGPoint)location;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	928 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	929
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	930 @implementation DWRender
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	931 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	932 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	933 -(void)setFont:(UIFont *)input { [font release]; font = input; [font retain]; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	934 -(UIFont *)font { return font; }
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	935 -(void)setSize:(CGSize)input {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	936 size = input;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	937 if(cachedImage)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	938 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	939 DWImage *oldimage = cachedImage;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	940 UIImage *newimage;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	941 UIGraphicsBeginImageContext(self.frame.size);
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	942 [[self layer] renderInContext:UIGraphicsGetCurrentContext()];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	943 newimage = UIGraphicsGetImageFromCurrentImageContext();
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	944 UIGraphicsEndImageContext();
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	945 cachedImage = [[DWImage alloc] initWithUIImage:newimage];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	946 [cachedImage retain];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	947 [oldimage release];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	948 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	949 }
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	950 -(CGSize)size { return size; }
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	951 -(DWImage *)cachedImage {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	952 if(!cachedImage)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	953 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	954 UIImage *newimage;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	955 UIGraphicsBeginImageContext(self.frame.size);
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	956 [[self layer] renderInContext:UIGraphicsGetCurrentContext()];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	957 newimage = UIGraphicsGetImageFromCurrentImageContext();
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	958 UIGraphicsEndImageContext();
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	959 cachedImage = [[DWImage alloc] initWithUIImage:newimage];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	960 [cachedImage retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	961 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	962 /* Mark this render dirty if something is requesting it to draw */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	963 if(![_DWDirtyDrawables containsObject:self])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	964 [_DWDirtyDrawables addObject:self];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	965 return cachedImage;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	966 }
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	967 -(void)drawRect:(CGRect)rect {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	968 _dw_event_handler(self, nil, _DW_EVENT_EXPOSE);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	969 if(cachedImage)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	970 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	971 [[cachedImage image] drawInRect:self.bounds];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	972 [_DWDirtyDrawables removeObject:self];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	973 [self setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	974 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	975 }
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	976 -(void)keyDown:(UIKey *)key API_AVAILABLE(ios(13.4)){ _dw_event_handler(self, key, _DW_EVENT_KEY_PRESS); }
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	977 -(void)touchesBegan:(NSSet<UITouch > )touches withEvent:(UIEvent *)event
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	978 {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	979 _dw_event_handler(self, event, _DW_EVENT_BUTTON_PRESS);
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	980 [super touchesBegan:touches withEvent:event];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	981 }
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	982 -(void)touchesEnded:(NSSet<UITouch > )touches withEvent:(UIEvent *)event
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	983 {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	984 _dw_event_handler(self, event, _DW_EVENT_BUTTON_RELEASE);
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	985 [super touchesEnded:touches withEvent:event];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	986 }
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	987 -(void)touchesMoved:(NSSet<UITouch > )touches withEvent:(UIEvent *)event
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	988 {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	989 _dw_event_handler(self, event, _DW_EVENT_MOTION_NOTIFY);
2610 da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	990 [super touchesMoved:touches withEvent:event];
da51be036599 iOS: Implement button press/release and motion notify. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2606 diff changeset	991 }
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	992 -(UIContextMenuConfiguration )contextMenuInteraction:(UIContextMenuInteraction )interaction configurationForMenuAtLocation:(CGPoint)location
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	993 {
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	994 DWWindow window = (DWWindow )[self window];
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	995 UIContextMenuConfiguration *config = nil;
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	996
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	997 _dw_event_point = location;
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	998 _dw_event_handler(self, nil, _DW_EVENT_BUTTON_PRESS);
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	999
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1000 if(window && [window popupMenu])
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1001 {
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1002 __block UIMenu *popupmenu = [[[window popupMenu] menu] retain];
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1003 config = [UIContextMenuConfiguration configurationWithIdentifier:nil
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1004 previewProvider:nil
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1005 actionProvider:^(NSArray* suggestedAction){return popupmenu;}];
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1006 [window setPopupMenu:nil];
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1007 }
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1008 return config;
6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	1009 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1010 -(void)dealloc {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1011 UserData *root = userdata;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1012 _dw_remove_userdata(&root, NULL, TRUE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1013 [font release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1014 dw_signal_disconnect_by_window(self);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1015 [cachedImage release];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1016 [_DWDirtyDrawables removeObject:self];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1017 [super dealloc];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1018 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1019 -(BOOL)acceptsFirstResponder { return YES; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1020 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1021
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1022 /* Subclass page renderer to implement page by page rendering */
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1023 @interface DWPrintPageRenderer : UIPrintPageRenderer
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1024 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1025 int (drawfunc)(HPRINT, HPIXMAP, int, void );
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1026 void *drawdata;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1027 unsigned long flags;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1028 unsigned int pages;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1029 HPRINT *print;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1030 }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1031 -(void)setDrawFunc:(void *)input;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1032 -(void)setDrawData:(void *)input;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1033 -(void *)drawData;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1034 -(void)setFlags:(unsigned long)input;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1035 -(unsigned long)flags;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1036 -(void)setPages:(unsigned int)input;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1037 -(void)setPrint:(HPRINT)input;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1038 @end
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1039
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1040 @implementation DWPrintPageRenderer
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1041 -(void)setDrawFunc:(void *)input { drawfunc = input; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1042 -(void)setDrawData:(void *)input { drawdata = input; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1043 -(void *)drawData { return drawdata; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1044 -(void)setFlags:(unsigned long)input { flags = input; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1045 -(unsigned long)flags { return flags; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1046 -(void)setPages:(unsigned int)input { pages = input; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1047 -(void)setPrint:(HPRINT)input { print = input; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1048 -(void)drawContentForPageAtIndex:(NSInteger)pageIndex inRect:(CGRect)contentRect
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1049 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1050 HPIXMAP pm = dw_pixmap_new(nil, contentRect.size.width, contentRect.size.height, 32);
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1051 DWImage *image = pm->image;
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	1052 CGBlendMode op = kCGBlendModeNormal;
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	1053
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1054 drawfunc(print, pm, (int)pageIndex, drawdata);
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	1055 [[image image] drawInRect:contentRect blendMode:op alpha:1.0];
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1056 dw_pixmap_destroy(pm);
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1057 }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1058 -(NSInteger)numberOfPages { return (NSInteger)pages; }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1059 @end
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1060
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1061 @interface DWFontPickerDelegate : UIResponder <UIFontPickerViewControllerDelegate>
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1062 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1063 DWDialog *dialog;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1064 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1065 -(void)fontPickerViewControllerDidPickFont:(UIFontPickerViewController *)viewController;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1066 -(void)fontPickerViewControllerDidCancel:(UIFontPickerViewController *)viewController;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1067 -(void)setDialog:(DWDialog *)newdialog;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1068 @end
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1069
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1070 @implementation DWFontPickerDelegate
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1071 -(void)fontPickerViewControllerDidPickFont:(UIFontPickerViewController *)viewController
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1072 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1073 if(viewController.selectedFontDescriptor)
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1074 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1075 UIFont *font = [UIFont fontWithDescriptor:viewController.selectedFontDescriptor size:9];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1076 dw_dialog_dismiss(dialog, font);
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1077 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1078 else
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1079 dw_dialog_dismiss(dialog, NULL);
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1080 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1081 -(void)fontPickerViewControllerDidCancel:(UIFontPickerViewController *)viewController
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1082 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1083 dw_dialog_dismiss(dialog, NULL);
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1084 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1085 -(void)setDialog:(DWDialog *)newdialog { dialog = newdialog; }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1086 @end
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1087
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1088 @interface DWColorPickerDelegate : UIResponder <UIColorPickerViewControllerDelegate>
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1089 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1090 DWDialog *dialog;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1091 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1092 -(void)colorPickerViewControllerDidSelectColor:(UIColorPickerViewController *)viewController API_AVAILABLE(ios(14.0));
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1093 -(void)colorPickerViewControllerDidFinish:(UIColorPickerViewController *)viewController API_AVAILABLE(ios(14.0));
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1094 -(void)setDialog:(DWDialog *)newdialog;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1095 @end
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1096
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1097 @implementation DWColorPickerDelegate
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1098 -(void)colorPickerViewControllerDidSelectColor:(UIColorPickerViewController *)viewController API_AVAILABLE(ios(14.0))
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1099 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1100 if([viewController selectedColor])
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1101 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1102 CGFloat red, green, blue;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1103 [[viewController selectedColor] getRed:&red green:&green blue:&blue alpha:NULL];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1104 dw_dialog_dismiss(dialog, DW_UINT_TO_POINTER(DW_RGB((int)(red * 255), (int)(green 255), (int)(blue 255))));
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1105 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1106 else
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1107 dw_dialog_dismiss(dialog, NULL);
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1108 [viewController dismissViewControllerAnimated:YES completion:nil];
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1109 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1110 -(void)colorPickerViewControllerDidFinish:(UIColorPickerViewController *)viewController API_AVAILABLE(ios(14.0))
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1111 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1112 dw_dialog_dismiss(dialog, NULL);
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1113 [viewController dismissViewControllerAnimated:YES completion:nil];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1114 }
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1115 -(void)setDialog:(DWDialog *)newdialog { dialog = newdialog; }
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1116 @end
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1117
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1118 @interface DWDocumentPickerDelegate : UIResponder <UIDocumentPickerDelegate>
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1119 {
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1120 DWDialog *dialog;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1121 }
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1122 -(void)documentPicker:(UIDocumentPickerViewController )controller didPickDocumentsAtURLs:(NSArray<NSURL > *)urls;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1123 -(void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1124 -(void)setDialog:(DWDialog *)newdialog;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1125 @end
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1126
2786 3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1127 #define _DW_URL_LIMIT 10
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1128 static NSMutableArray *_dw_URLs = nil;
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1129
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1130 @implementation DWDocumentPickerDelegate
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1131 -(void)documentPicker:(UIDocumentPickerViewController )controller didPickDocumentsAtURLs:(NSArray<NSURL > *)urls
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1132 {
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1133 NSURL *url = [urls firstObject];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1134 char *file = NULL;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1135
2593 cc2befdc97e8 iOS: Switch to using the NSURL fileSystemRepresentation method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2591 diff changeset	1136 if(url)
cc2befdc97e8 iOS: Switch to using the NSURL fileSystemRepresentation method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2591 diff changeset	1137 {
cc2befdc97e8 iOS: Switch to using the NSURL fileSystemRepresentation method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2591 diff changeset	1138 const char *tmp = [url fileSystemRepresentation];
2445 a773008c7c5d iOS: Make sure the plain text UTI is used with filePicker. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2444 diff changeset	1139
2786 3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1140 if(tmp && [url startAccessingSecurityScopedResource])
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1141 {
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1142 /* We need to allow access to the returned URLs on iOS 13
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1143 * but we have no way of knowing when it is no longer needed...
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1144 * since the C API we are connected to does not have that information.
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1145 * So maintain a list of URLs, and when the list exceeds the limit...
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1146 * revoke access to the oldest URL.
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1147 */
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1148 if(!_dw_URLs)
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1149 _dw_URLs = [[[NSMutableArray alloc] init] retain];
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1150 if(_dw_URLs)
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1151 {
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1152 if([_dw_URLs count] >= _DW_URL_LIMIT)
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1153 {
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1154 NSURL *oldurl = [_dw_URLs firstObject];
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1155 [oldurl stopAccessingSecurityScopedResource];
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1156 [_dw_URLs removeObject:oldurl];
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1157 }
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1158 [_dw_URLs addObject:url];
3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1159 }
2593 cc2befdc97e8 iOS: Switch to using the NSURL fileSystemRepresentation method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2591 diff changeset	1160 file = strdup(tmp);
2786 3934ac8b394c iOS: Make dw_file_browse() grant access to security scoped resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2772 diff changeset	1161 }
2445 a773008c7c5d iOS: Make sure the plain text UTI is used with filePicker. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2444 diff changeset	1162 }
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1163 dw_dialog_dismiss(dialog, file);
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1164 }
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1165 -(void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1166 {
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1167 dw_dialog_dismiss(dialog, NULL);
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1168 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1169 -(void)setDialog:(DWDialog *)newdialog { dialog = newdialog; }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1170 @end
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1171
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1172 @implementation DWObject
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1173 -(id)init
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1174 {
2395 2618277de356 iOS: Code error cleanup reported by LLVM. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2393 diff changeset	1175 self = [super init];
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1176 /* This previously had the code in delayedIinit: */
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1177 return self;
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1178 }
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1179 -(void)delayedInit:(id)param
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1180 {
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1181 /* When DWObject is initialized, UIApplicationMain() has not yet been called...
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1182 * So the created objects can't interact with the user interface... therefore
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1183 * we wait until UIApplicationMain() has been called and run this then.
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1184 */
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1185 hiddenWindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1186 [hiddenWindow setWindowLevel:UIWindowLevelAlert+1];
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1187 [hiddenWindow setHidden:YES];
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1188 [hiddenWindow setRootViewController:[UIViewController new]];
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1189 /* Handle setting the dark mode state now that DWObj is valid */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1190 if(_dw_dark_mode_state != DW_FEATURE_UNSUPPORTED)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1191 dw_feature_set(DW_FEATURE_DARK_MODE, _dw_dark_mode_state);
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1192 }
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1193 -(UIWindow *)hiddenWindow { return hiddenWindow; };
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1194 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1195 -(void)menuHandler:(id)param
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1196 {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1197 _dw_event_handler(param, nil, _DW_EVENT_CLICKED);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1198 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1199 -(void)callBack:(NSPointerArray *)params
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1200 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1201 void (mycallback)(NSPointerArray ) = [params pointerAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1202 if(mycallback)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1203 mycallback(params);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1204 }
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1205 -(void)colorPicker:(NSMutableArray *)params
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1206 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1207 if (@available(iOS 14.0, *))
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1208 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1209 DWDialog *dialog = dw_dialog_new(NULL);
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1210 UIColorPickerViewController *picker = [[UIColorPickerViewController alloc] init];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1211 DWColorPickerDelegate *delegate = [[DWColorPickerDelegate alloc] init];
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	1212 unsigned long color = [[params firstObject] unsignedLongValue];
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1213
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1214 /* Setup our picker */
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1215 [picker setSupportsAlpha:NO];
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1216 /* Unhide our hidden window and make it key */
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1217 [hiddenWindow setHidden:NO];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1218 [hiddenWindow makeKeyAndVisible];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1219 [delegate setDialog:dialog];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1220 [picker setDelegate:delegate];
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	1221 [picker setSelectedColor:[UIColor colorWithRed: DW_RED_VALUE(color)/255.0 green: DW_GREEN_VALUE(color)/255.0 blue: DW_BLUE_VALUE(color)/255.0 alpha: 1]];
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1222 /* Wait for them to pick a color */
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1223 [[hiddenWindow rootViewController] presentViewController:picker animated:YES completion:nil];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1224 [params addObject:[NSNumber numberWithUnsignedLong:DW_POINTER_TO_UINT(dw_dialog_wait(dialog))]];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1225 /* Once the dialog is gone we can rehide our window */
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1226 [hiddenWindow resignKeyWindow];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1227 [hiddenWindow setHidden:YES];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1228 [picker release];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1229 [delegate release];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1230 } else {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1231 // Fallback on earlier versions
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1232 };
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1233 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1234 -(void)fontPicker:(NSPointerArray *)params
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1235 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1236 DWDialog *dialog = dw_dialog_new(NULL);
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1237 UIFontPickerViewController *picker = [[UIFontPickerViewController alloc] init];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1238 DWFontPickerDelegate *delegate = [[DWFontPickerDelegate alloc] init];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1239 UIFont *font;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1240
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1241 /* Unhide our hidden window and make it key */
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1242 [hiddenWindow setHidden:NO];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1243 [hiddenWindow makeKeyAndVisible];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1244 [delegate setDialog:dialog];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1245 [picker setDelegate:delegate];
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	1246 /* Wait for them to pick a font */
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1247 [[hiddenWindow rootViewController] presentViewController:picker animated:YES completion:nil];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1248 font = dw_dialog_wait(dialog);
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1249 /* Once the dialog is gone we can rehide our window */
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1250 [hiddenWindow resignKeyWindow];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1251 [hiddenWindow setHidden:YES];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1252
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1253 if(font)
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1254 {
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1255 NSString *fontname = [font fontName];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1256 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1257 [params addPointer:strdup([output UTF8String])];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1258 }
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1259 else
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1260 [params addPointer:NULL];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1261 [picker release];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1262 [delegate release];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	1263 }
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1264 -(void)filePicker:(NSPointerArray *)params
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1265 {
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1266 DWDialog *dialog = dw_dialog_new(NULL);
2712 ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1267 UIDocumentPickerViewController *picker;
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1268 DWDocumentPickerDelegate *delegate = [[DWDocumentPickerDelegate alloc] init];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1269 char *defpath = [params pointerAtIndex:0];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1270 char *ext = [params pointerAtIndex:1];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1271 int flags = DW_POINTER_TO_INT([params pointerAtIndex:2]);
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1272 char *file = NULL;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1273 NSArray *UTIs;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1274
2712 ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1275 if (@available(iOS 14, *)) {
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1276 UTType *extuti = ext ? [UTType typeWithFilenameExtension:[NSString stringWithUTF8String:ext]] : nil;
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1277
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1278 /* Try to generate a UTI for our passed extension */
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1279 if(flags & DW_DIRECTORY_OPEN)
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1280 UTIs = @[UTTypeFolder];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1281 else
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1282 {
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1283 if(extuti)
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1284 UTIs = [NSArray arrayWithObjects:extuti, UTTypeText, nil];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1285 else
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1286 UTIs = @[UTTypeText];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1287 }
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1288 picker = [[UIDocumentPickerViewController alloc] initForOpeningContentTypes:UTIs
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1289 asCopy:(flags & DW_FILE_SAVE ? YES: NO)];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1290 } else {
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1291 UIDocumentPickerMode mode = UIDocumentPickerModeOpen;
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1292
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1293 /* Try to generate a UTI for our passed extension */
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1294 if(flags & DW_DIRECTORY_OPEN)
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1295 UTIs = @[@"public.directory"];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1296 else
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1297 {
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1298 if(ext)
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1299 UTIs = [NSArray arrayWithObjects:[NSString stringWithFormat:@"public.%s", ext], @"public.text", nil];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1300 else
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1301 UTIs = @[@"public.text"];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1302 }
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1303
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1304 /* Setup the picker */
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1305 if(flags & DW_FILE_SAVE)
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1306 mode = UIDocumentPickerModeExportToService;
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1307
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1308 picker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:UTIs inMode:mode];
ada3ac4677f6 iOS: Add file browser support for selecting folders/directories. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2711 diff changeset	1309 }
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1310 [picker setAllowsMultipleSelection:NO];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1311 [picker setShouldShowFileExtensions:YES];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1312 if(defpath)
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1313 [picker setDirectoryURL:[NSURL URLWithString:[NSString stringWithUTF8String:defpath]]];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1314 /* Unhide our hidden window and make it key */
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1315 [hiddenWindow setHidden:NO];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1316 [hiddenWindow makeKeyAndVisible];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1317 [delegate setDialog:dialog];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1318 [picker setDelegate:delegate];
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	1319 /* Wait for them to pick a file */
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1320 [[hiddenWindow rootViewController] presentViewController:picker animated:YES completion:nil];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1321 file = dw_dialog_wait(dialog);
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1322 /* Once the dialog is gone we can rehide our window */
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1323 [hiddenWindow resignKeyWindow];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1324 [hiddenWindow setHidden:YES];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1325 [params addPointer:file];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1326 [picker release];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1327 [delegate release];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	1328 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1329 -(void)messageBox:(NSMutableArray *)params
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1330 {
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1331 __block DWDialog *dialog = dw_dialog_new(NULL);
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1332 NSInteger iResponse;
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1333 UIAlertController* alert = [UIAlertController alertControllerWithTitle:[params objectAtIndex:0]
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1334 message:[params objectAtIndex:1]
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1335 preferredStyle:[[params objectAtIndex:2] integerValue]];
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1336 UIAlertAction* action = [UIAlertAction actionWithTitle:[params objectAtIndex:3] style:UIAlertActionStyleDefault
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1337 handler:^(UIAlertAction * action) { dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(1)); }];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1338 [alert addAction:action];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1339 if([params count] > 4)
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1340 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1341 action = [UIAlertAction actionWithTitle:[params objectAtIndex:4] style:UIAlertActionStyleDefault
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1342 handler:^(UIAlertAction * action) { dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(2)); }];
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1343 [alert addAction:action];
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1344 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1345 if([params count] > 5)
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1346 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1347 action = [UIAlertAction actionWithTitle:[params objectAtIndex:5] style:UIAlertActionStyleDefault
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1348 handler:^(UIAlertAction * action) { dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(3)); }];
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1349 [alert addAction:action];
b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1350 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1351
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1352 /* Unhide our hidden window and make it key */
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1353 [hiddenWindow setHidden:NO];
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1354 [hiddenWindow makeKeyAndVisible];
a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1355 [[hiddenWindow rootViewController] presentViewController:alert animated:YES completion:nil];
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1356 iResponse = DW_POINTER_TO_INT(dw_dialog_wait(dialog));
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1357 /* Once the dialog is gone we can rehide our window */
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	1358 [hiddenWindow resignKeyWindow];
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	1359 [hiddenWindow setHidden:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1360 [params addObject:[NSNumber numberWithInteger:iResponse]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1361 }
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1362 -(void)printDialog:(NSMutableArray *)params
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1363 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1364 __block DWDialog *dialog = dw_dialog_new(NULL);
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1365 UIPrintInteractionController *pc = [UIPrintInteractionController sharedPrintController];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1366 UIPrintInfo *pi = [params firstObject];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1367 DWPrintPageRenderer *renderer = [params objectAtIndex:1];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1368 /* Not currently using the passed in flags, but when we need them...
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1369 NSNumber flags = [params objectAtIndex:2];/
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1370 int result = DW_ERROR_UNKNOWN;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1371
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1372 /* Setup our print dialog */
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1373 [pc setPrintInfo:pi];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1374 [pc setPrintPageRenderer:renderer];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1375
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1376 /* Present the shared printer dialog */
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1377 [pc presentAnimated:YES completionHandler:^(UIPrintInteractionController * _Nonnull printInteractionController, BOOL completed, NSError * _Nullable error) {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1378 dw_dialog_dismiss(dialog, DW_INT_TO_POINTER((completed ? DW_ERROR_NONE : DW_ERROR_UNKNOWN)));
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1379 }];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1380 result = DW_POINTER_TO_INT(dw_dialog_wait(dialog));
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1381
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1382 [params addObject:[NSNumber numberWithInteger:result]];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	1383 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1384 -(void)safeCall:(SEL)sel withObject:(id)param
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1385 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1386 if([self respondsToSelector:sel])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1387 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1388 DWTID curr = pthread_self();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1389
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1390 if(DWThread == (DWTID)-1 \|\| DWThread == curr)
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1391 [self performSelector:sel withObject:param];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1392 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1393 [self performSelectorOnMainThread:sel withObject:param waitUntilDone:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1394 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1395 }
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	1396 -(void)updateMenu:(id)param
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	1397 {
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	1398 for(id obj in _dw_toplevel_windows)
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	1399 [obj updateMenu];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	1400 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1401 -(void)doBitBlt:(id)param
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1402 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1403 NSValue bi = (NSValue )param;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1404 DWBitBlt bltinfo = (DWBitBlt )[bi pointerValue];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1405 id bltdest = bltinfo->dest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1406 id bltsrc = bltinfo->src;
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1407 CGContextRef context = _dw_draw_context(bltdest, NO);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1408
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1409 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1410 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1411
2437 929ce3cd18ea iOS: Fix bitblt and crashes due to missing retains. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2436 diff changeset	1412 if(bltdest && [bltsrc isMemberOfClass:[DWImage class]])
929ce3cd18ea iOS: Fix bitblt and crashes due to missing retains. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2436 diff changeset	1413 {
929ce3cd18ea iOS: Fix bitblt and crashes due to missing retains. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2436 diff changeset	1414 DWImage *rep = bltsrc;
929ce3cd18ea iOS: Fix bitblt and crashes due to missing retains. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2436 diff changeset	1415 UIImage *image = [rep image];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1416 CGBlendMode op = kCGBlendModeNormal;
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1417
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1418 if(bltinfo->srcwidth != -1)
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1419 {
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1420 [image drawInRect:CGRectMake(bltinfo->xdest, bltinfo->ydest, bltinfo->width, bltinfo->height)
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1421 /fromRect:CGRectMake(bltinfo->xsrc, bltinfo->ysrc, bltinfo->srcwidth, bltinfo->srcheight)/
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1422 blendMode:op alpha:1.0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1423 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1424 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1425 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1426 [image drawAtPoint:CGPointMake(bltinfo->xdest, bltinfo->ydest)
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1427 /fromRect:CGRectMake(bltinfo->xsrc, bltinfo->ysrc, bltinfo->width, bltinfo->height)/
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1428 blendMode:op alpha:1.0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1429 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1430 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1431 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1432 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1433 free(bltinfo);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1434 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1435 -(void)doFlush:(id)param
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1436 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1437 NSEnumerator *enumerator = [_DWDirtyDrawables objectEnumerator];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1438 DWRender *rend;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1439
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1440 while(rend = [enumerator nextObject])
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	1441 [rend setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1442 [_DWDirtyDrawables removeAllObjects];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1443 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1444 -(void)doWindowFunc:(id)param
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1445 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1446 NSValue v = (NSValue )param;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1447 void params = (void )[v pointerValue];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1448 void (* windowfunc)(void *);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1449
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1450 if(params)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1451 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1452 windowfunc = params[0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1453 if(windowfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1454 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1455 windowfunc(params[1]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1456 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1457 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1458 }
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1459 -(void)getUserInterfaceStyle:(id)param
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1460 {
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1461 NSMutableArray *array = param;
2459 ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1462 UIUserInterfaceStyle overridestyle = [hiddenWindow overrideUserInterfaceStyle];
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1463 int retval;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1464
2459 ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1465 switch(overridestyle)
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1466 {
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1467 case UIUserInterfaceStyleLight:
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1468 retval = DW_DARK_MODE_DISABLED;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1469 break;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1470 case UIUserInterfaceStyleDark:
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1471 retval = DW_DARK_MODE_FORCED;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1472 break;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1473 default: /* UIUserInterfaceStyleUnspecified */
2459 ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1474 {
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1475 UIUserInterfaceStyle style = [[[hiddenWindow rootViewController] traitCollection] userInterfaceStyle];
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1476
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1477 switch(style)
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1478 {
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1479 case UIUserInterfaceStyleLight:
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1480 retval = DW_DARK_MODE_BASIC;
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1481 break;
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1482 case UIUserInterfaceStyleDark:
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1483 retval = DW_DARK_MODE_FULL;
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1484 break;
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1485 default: /* UIUserInterfaceStyleUnspecified */
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1486 retval = DW_FEATURE_UNSUPPORTED;
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1487 break;
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1488 }
ddc6d49d1110 iOS: Reorganize the code so retval doesn't get clobbered without the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2458 diff changeset	1489 }
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1490 }
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1491 [array addObject:[NSNumber numberWithInt:retval]];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1492 }
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1493 -(void)setUserInterfaceStyle:(id)param
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1494 {
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1495 NSNumber *number = param;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1496 UIUserInterfaceStyle style = [number intValue];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1497
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1498 [hiddenWindow setOverrideUserInterfaceStyle:style];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	1499 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1500 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1501
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1502 DWObject *DWObj;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1503
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1504 /* Returns TRUE if iOS 12+ is in Dark Mode */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1505 BOOL _dw_is_dark(void)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1506 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1507 if([[[[DWObj hiddenWindow] rootViewController] traitCollection] userInterfaceStyle] == UIUserInterfaceStyleDark)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1508 return YES;
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1509 return NO;
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1510 }
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	1511
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1512 @interface DWWebView : WKWebView <WKNavigationDelegate>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1513 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1514 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1515 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1516 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1517 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1518 -(void)webView:(WKWebView )webView didCommitNavigation:(WKNavigation )navigation;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1519 -(void)webView:(WKWebView )webView didFinishNavigation:(WKNavigation )navigation;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1520 -(void)webView:(WKWebView )webView didStartProvisionalNavigation:(WKNavigation )navigation;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1521 -(void)webView:(WKWebView )webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation )navigation;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1522 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1523
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1524 @implementation DWWebView : WKWebView
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1525 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1526 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1527 -(void)webView:(WKWebView )webView didCommitNavigation:(WKNavigation )navigation
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1528 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1529 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [[self URL] absoluteString] };
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1530 _dw_event_handler(self, (id)params, _DW_EVENT_HTML_CHANGED);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1531 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1532 -(void)webView:(WKWebView )webView didFinishNavigation:(WKNavigation )navigation
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1533 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1534 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [[self URL] absoluteString] };
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1535 _dw_event_handler(self, (id)params, _DW_EVENT_HTML_CHANGED);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1536 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1537 -(void)webView:(WKWebView )webView didStartProvisionalNavigation:(WKNavigation )navigation
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1538 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1539 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [[self URL] absoluteString] };
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1540 _dw_event_handler(self, (id)params, _DW_EVENT_HTML_CHANGED);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1541 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1542 -(void)webView:(WKWebView )webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation )navigation
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1543 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1544 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_REDIRECT), [[self URL] absoluteString] };
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1545 _dw_event_handler(self, (id)params, _DW_EVENT_HTML_CHANGED);
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1546 }
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1547 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1548 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1549
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1550 /* Subclass for a top-level window */
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	1551 @interface DWView : DWBox /* <UIWindowDelegate> */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1552 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	1553 CGSize oldsize;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1554 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1555 -(void)windowDidBecomeMain:(id)sender;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1556 -(void)menuHandler:(id)sender;
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	1557 -(UIResponder *)nextResponder;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1558 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1559
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1560 @implementation DWView
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	1561 -(void)willMoveToSuperview:(UIView *)newSuperview
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	1562 {
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	1563 if(newSuperview)
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	1564 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:UIWindowDidBecomeKeyNotification object:[newSuperview window]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1565 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1566 -(void)dealloc
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1567 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1568 [[NSNotificationCenter defaultCenter] removeObserver:self];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1569 dw_signal_disconnect_by_window(self);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1570 [super dealloc];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1571 }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1572 -(void)windowResized:(CGSize)size;
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1573 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1574 if(oldsize.width != size.width \|\| oldsize.height != size.height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1575 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1576 _dw_do_resize(box, size.width, size.height);
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1577 _dw_event_handler([self window], nil, _DW_EVENT_CONFIGURE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1578 oldsize.width = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1579 oldsize.height = size.height;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1580 _dw_handle_resize_events(box);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1581 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1582 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1583 -(void)showWindow
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1584 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	1585 CGSize size = [self frame].size;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1586
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1587 if(oldsize.width == size.width && oldsize.height == size.height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1588 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1589 _dw_do_resize(box, size.width, size.height);
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1590 _dw_handle_resize_events(box);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1591 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1592
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1593 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1594 -(void)windowDidBecomeMain:(id)sender
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1595 {
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1596 _dw_event_handler([self window], nil, _DW_EVENT_SET_FOCUS);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1597 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1598 -(void)menuHandler:(id)sender
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1599 {
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	1600 [DWObj menuHandler:sender];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1601 }
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	1602 -(UIResponder *)nextResponder { return [[self window] rootViewController]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1603 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1604
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1605 @interface DWViewController : UIViewController
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1606 -(void)viewWillLayoutSubviews;
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	1607 -(UIResponder *)nextResponder;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1608 @end
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1609
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1610
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1611 @implementation DWViewController : UIViewController {}
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1612 -(void)viewWillLayoutSubviews
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1613 {
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1614 DWWindow window = (DWWindow )[[self view] window];
2599 32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	1615 NSArray *array = [[self view] subviews];
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	1616 CGRect frame = [window frame];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1617 DWView *view = nil;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1618 UINavigationBar *nav = nil;
2570 2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	1619 NSInteger sbheight = [[[window windowScene] statusBarManager] statusBarFrame].size.height;
2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	1620
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1621 for(id obj in array)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1622 {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1623 if([obj isMemberOfClass:[DWView class]])
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1624 view = obj;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1625 else if([obj isMemberOfClass:[UINavigationBar class]])
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1626 nav = obj;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1627 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1628 /* Adjust the frame to account for the status bar and navigation bar if it exists */
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1629 if(nav)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1630 {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1631 CGRect navrect = [nav frame];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1632
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1633 navrect.size.width = frame.size.width;
2570 2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	1634 navrect.origin.x = 0;
2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	1635 navrect.origin.y = sbheight;
2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	1636 sbheight += navrect.size.height;
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1637 [nav setFrame:navrect];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1638
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1639 if (@available(iOS 14.0, *)) {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1640 DWMenu *windowmenu = [window menu];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1641 UINavigationItem *item = [[nav items] firstObject];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1642
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1643 if(windowmenu && !item.rightBarButtonItem)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1644 {
2600 0bb974e70435 iOS: Fix crash by retaining the UIMenu returned in the block. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2599 diff changeset	1645 UIMenu *menu = [windowmenu menu];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1646 UIBarButtonItem *options = [[UIBarButtonItem alloc] initWithImage:[UIImage systemImageNamed:@"list.bullet"]
2600 0bb974e70435 iOS: Fix crash by retaining the UIMenu returned in the block. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2599 diff changeset	1647 menu:menu];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1648 item.rightBarButtonItem = options;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1649 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1650 } else {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1651 // Fallback on earlier versions
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1652 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1653 }
2409 2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	1654 frame.size.height -= sbheight;
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	1655 /* Account for the special area on iPhone X and iPad Pro
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	1656 * https://blog.maxrudberg.com/post/165590234593/ui-design-for-iphone-x-bottom-elements
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	1657 */
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	1658 frame.size.height -= 24;
2409 2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	1659 frame.origin.y += sbheight;
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	1660 [view setFrame:frame];
38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	1661 [view windowResized:frame.size];
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1662 }
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	1663 -(UIResponder *)nextResponder { return [[self viewIfLoaded] window]; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1664 @end
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1665
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1666 #define _DW_BUTTON_TYPE_NORMAL 0
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1667 #define _DW_BUTTON_TYPE_CHECK 1
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1668 #define _DW_BUTTON_TYPE_RADIO 2
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1669 #define _DW_BUTTON_TYPE_TREE 3
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1670
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1671 /* Subclass for a button type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1672 @interface DWButton : UIButton
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1673 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1674 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1675 DWBox *parent;
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1676 int type, checkstate;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1677 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1678 @property(nonatomic, strong) void(^didCheckedChanged)(BOOL checked);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1679 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1680 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1681 -(void)buttonClicked:(id)sender;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1682 -(void)setParent:(DWBox *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1683 -(DWBox *)parent;
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1684 -(int)type;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1685 -(void)setType:(int)input;
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	1686 -(int)checkState;
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1687 -(void)setCheckState:(int)input;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1688 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1689
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1690 @implementation DWButton
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1691 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1692 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1693 -(void)buttonClicked:(id)sender
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1694 {
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1695 /* Toggle the button */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1696 if(type == _DW_BUTTON_TYPE_CHECK \|\| type == _DW_BUTTON_TYPE_TREE)
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1697 [self setCheckState:(checkstate ? FALSE : TRUE)];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1698 else if(type == _DW_BUTTON_TYPE_RADIO)
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1699 [self setCheckState:TRUE];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1700
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	1701 _dw_event_handler(self, nil, _DW_EVENT_CLICKED);
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1702
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1703 /* If it is a radio button, uncheck all the other radio buttons in the box */
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1704 if(type == _DW_BUTTON_TYPE_RADIO)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1705 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1706 DWBox *viewbox = [self parent];
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1707 Box *thisbox = [viewbox box];
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1708 int z;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1709
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1710 for(z=0;z<thisbox->count;z++)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1711 {
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	1712 if(thisbox->items[z].type != _DW_TYPE_BOX)
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1713 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1714 id object = thisbox->items[z].hwnd;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1715
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1716 if([object isMemberOfClass:[DWButton class]])
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1717 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1718 DWButton *button = object;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1719
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1720 if(button != self && [button type] == _DW_BUTTON_TYPE_RADIO)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1721 {
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1722 [button setCheckState:FALSE];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1723 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1724 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1725 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1726 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1727 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1728 if(_didCheckedChanged)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1729 _didCheckedChanged(checkstate);
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1730 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1731 -(void)setParent:(DWBox *)input { parent = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1732 -(DWBox *)parent { return parent; }
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1733 -(int)type { return type; }
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1734 -(void)setType:(int)input
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1735 {
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1736 type = input;
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1737 if(type == _DW_BUTTON_TYPE_NORMAL)
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1738 [self setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1739 else
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1740 [self setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1741 [self updateImage];
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1742 }
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1743 -(void)updateImage
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1744 {
2424 6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1745 NSString *imagename = nil;
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1746
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1747 switch(type)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1748 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1749 case _DW_BUTTON_TYPE_CHECK:
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1750 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1751
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1752 if(checkstate)
2424 6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1753 imagename = @"checkmark.square";
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1754 else
2424 6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1755 imagename = @"square";
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1756 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1757 break;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1758 case _DW_BUTTON_TYPE_RADIO:
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1759 {
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1760 if(checkstate)
2424 6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1761 imagename = @"largecircle.fill.circle";
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1762 else
2424 6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1763 imagename = @"circle";
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1764 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1765 break;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1766 case _DW_BUTTON_TYPE_TREE:
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1767 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1768 if(checkstate)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1769 imagename = @"chevron.down";
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1770 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1771 imagename = @"chevron.forward";
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1772 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	1773 break;
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1774 }
2424 6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1775 if(imagename)
6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1776 {
6b302a8c856f iOS: Fix checked image not showing due to typo in image name. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2423 diff changeset	1777 UIImage *image = [UIImage systemImageNamed:imagename];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1778 CGSize size = [image size];
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1779 [self setImage:image forState:UIControlStateNormal];
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1780 [self setTitleEdgeInsets:UIEdgeInsetsMake(0,size.width,0,0)];
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1781 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	1782 }
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1783 -(int)checkState { return checkstate; }
1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	1784 -(void)setCheckState:(int)input { checkstate = input; [self updateImage]; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1785 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1786 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1787
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1788 /* Subclass for a progress type */
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	1789 @interface DWPercent : UIProgressView
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1790 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1791 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1792 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1793 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1794 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1795 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1796
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1797 @implementation DWPercent
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1798 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1799 -(void)setUserdata:(void *)input { userdata = input; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	1800 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1801 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1802
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1803 /* Subclass for a menu item type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1804 @implementation DWMenuItem
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1805 -(void)setCheck:(BOOL)input { check = input; }
2601 3201f9e9067b iOS: Actually implement disabled menu items using UIMenuElementAttributesDisabled. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2600 diff changeset	1806 -(void)setEnabled:(BOOL)input { enabled = input; [self setAttributes:(enabled ? 0 : UIMenuElementAttributesDisabled)]; }
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1807 -(void)setSubmenu:(DWMenu *)input { submenu = input; }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1808 -(void)setMenu:(DWMenu *)input { menu = input; }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1809 -(void)setTag:(unsigned long)input { tag = input; }
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1810 -(BOOL)check { return check; }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1811 -(BOOL)enabled { return enabled; }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1812 -(DWMenu *)submenu { return submenu; }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1813 -(DWMenu *)menu { return menu; }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1814 -(unsigned long)tag { return tag; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1815 -(void)dealloc { dw_signal_disconnect_by_window(self); [super dealloc]; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1816 @end
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1817 /*
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1818 * Encapsulate immutable objects in our own containers,
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1819 * so we can recreate the immutable subobjects as needed.
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1820 * Currently in this category: DWMenu and DWImage
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1821 */
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1822 @implementation DWMenu
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1823 -(id)initWithTag:(unsigned long)newtag
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1824 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1825 self = [super init];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1826 if(self)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1827 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1828 children = [[NSMutableArray alloc] init];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1829 tag = newtag;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1830 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1831 return self;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1832 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1833 -(void)setTitle:(NSString *)input { title = input; [title retain]; }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1834 -(UIMenu *)menu
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1835 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1836 /* Create or recreate the UIMenu recursively */
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1837 UIMenu *oldmenu = menu;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1838 NSMutableArray *menuchildren = [[NSMutableArray alloc] init];
2605 d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1839 NSMutableArray *section = menuchildren;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1840
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1841 for(id child in children)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1842 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1843 if([child isMemberOfClass:[DWMenuItem class]])
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1844 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1845 DWMenuItem *menuitem = child;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1846 DWMenu *submenu = [menuitem submenu];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1847
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1848 if(submenu)
2605 d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1849 [section addObject:[submenu menu]];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1850 else
2605 d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1851 [section addObject:child];
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1852 }
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1853 /* NSNull entry tells us to make a new section...
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1854 * we do this by making a new UIMenu inline.
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1855 */
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1856 else if([child isMemberOfClass:[NSNull class]])
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1857 {
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1858 if(section != menuchildren)
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1859 {
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1860 UIMenu *sectionmenu = [UIMenu menuWithTitle:@""
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1861 image:nil
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1862 identifier:nil
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1863 options:UIMenuOptionsDisplayInline
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1864 children:section];
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1865 [menuchildren addObject:sectionmenu];
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1866 }
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1867 section = [[NSMutableArray alloc] init];
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1868 }
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1869 }
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1870 if(section != menuchildren)
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1871 {
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1872 UIMenu *sectionmenu = [UIMenu menuWithTitle:@""
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1873 image:nil
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1874 identifier:nil
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1875 options:UIMenuOptionsDisplayInline
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1876 children:section];
d60a44a27d70 iOS: Implement menu separators using inline UIMenus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2604 diff changeset	1877 [menuchildren addObject:sectionmenu];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1878 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1879 if(title)
2603 592f3003f853 iOS: Switch to using UIKeyCommand for menu items so we can use they keyboard bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2602 diff changeset	1880 {
592f3003f853 iOS: Switch to using UIKeyCommand for menu items so we can use they keyboard bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2602 diff changeset	1881 menu = [UIMenu menuWithTitle:title image:[UIImage systemImageNamed:@"ellipsis"] identifier:nil
592f3003f853 iOS: Switch to using UIKeyCommand for menu items so we can use they keyboard bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2602 diff changeset	1882 options:0 children:menuchildren];
592f3003f853 iOS: Switch to using UIKeyCommand for menu items so we can use they keyboard bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2602 diff changeset	1883 }
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1884 else
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1885 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1886 if(@available(iOS 14.0, *))
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1887 menu = [UIMenu menuWithChildren:menuchildren];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1888 else
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1889 menu = [UIMenu menuWithTitle:@"" children:menuchildren];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1890 }
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1891 [menu retain];
2817 5000a8a43825 iOS: Fix some memory leaks and remove unnecessary code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2813 diff changeset	1892 [menuchildren release];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1893 if(oldmenu)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1894 [oldmenu release];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1895 return menu;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1896 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1897 -(void)addItem:(id)item
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1898 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1899 [children addObject:item];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1900 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1901 -(void)removeItem:(id)item
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1902 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1903 [children removeObject:item];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1904 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1905 -(unsigned long)tag { return tag; }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1906 -(id)childWithTag:(unsigned long)tag
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1907 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1908 if(tag > 0)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1909 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1910 for(id child in children)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1911 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1912 if([child isMemberOfClass:[DWMenuItem class]] && [child tag] == tag)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1913 return child;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	1914 }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1915 }
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1916 return nil;
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1917 }
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1918 -(void)dealloc
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1919 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1920 if(menu)
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1921 [menu release];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1922 [super dealloc];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	1923 }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1924 @end
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1925
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	1926 @implementation DWImage
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1927 -(id)initWithSize:(CGSize)size
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1928 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1929 self = [super init];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1930 if(self)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1931 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1932 CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1933 CGContextRef cgcontext = CGBitmapContextCreate(NULL, size.width, size.height, 8, 0, rgb, kCGImageAlphaPremultipliedFirst);
2438 f273dbf1312f iOS: Fix DWImage internal core graphics context being flipped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2437 diff changeset	1934 CGAffineTransform flipVertical = CGAffineTransformMake(1, 0, 0, -1, 0, size.height);
f273dbf1312f iOS: Fix DWImage internal core graphics context being flipped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2437 diff changeset	1935 CGContextConcatCTM(cgcontext, flipVertical);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1936 CGImageRef cgimage = CGBitmapContextCreateImage(cgcontext);
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1937 image = [UIImage imageWithCGImage:cgimage];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1938 CGContextRelease(cgcontext);
2437 929ce3cd18ea iOS: Fix bitblt and crashes due to missing retains. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2436 diff changeset	1939 [image retain];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1940 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1941 return self;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1942 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1943 -(id)initWithCGImage:(CGImageRef)cgimage
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1944 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1945 self = [super init];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1946 if(self)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1947 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1948 image = [UIImage imageWithCGImage:cgimage];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1949 [image retain];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1950 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1951 return self;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1952 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1953 -(id)initWithUIImage:(UIImage *)newimage
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1954 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1955 self = [super init];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1956 if(self)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1957 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1958 image = newimage;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1959 [image retain];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1960 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1961 return self;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1962 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1963 -(void)setImage:(UIImage *)input
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1964 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1965 UIImage *oldimage = image;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1966 image = input;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1967 [image retain];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1968 [oldimage release];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1969 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1970 -(UIImage *)image
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1971 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1972 /* If our CGContext has been modified... */
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1973 if(cgcontext)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1974 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1975 UIImage *oldimage = image;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1976 CGImageRef cgimage;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1977
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1978 /* Create a new UIImage from the CGContext via CGImage */
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1979 cgimage = CGBitmapContextCreateImage(cgcontext);
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1980 image = [UIImage imageWithCGImage:cgimage];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1981 CGContextRelease(cgcontext);
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1982 cgcontext = nil;
2437 929ce3cd18ea iOS: Fix bitblt and crashes due to missing retains. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2436 diff changeset	1983 [image retain];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1984 [oldimage release];
2737 74b69da35e91 iOS: Fix a pixmap memory leak, CGImage needs to be released after using it bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2729 diff changeset	1985 CGImageRelease(cgimage);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1986 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1987 return image;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1988 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1989 -(CGContextRef)cgcontext
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1990 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1991 /* If we don't have an active context, create a bitmap
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1992 * context and copy the image from our UIImage.
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1993 */
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1994 if(!cgcontext)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1995 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1996 CGSize size = [image size];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1997 CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	1998
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	1999 cgcontext = CGBitmapContextCreate(NULL, size.width, size.height, 8, 0, rgb, kCGImageAlphaPremultipliedFirst);
2438 f273dbf1312f iOS: Fix DWImage internal core graphics context being flipped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2437 diff changeset	2000 CGAffineTransform flipVertical = CGAffineTransformMake(1, 0, 0, -1, 0, size.height);
f273dbf1312f iOS: Fix DWImage internal core graphics context being flipped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2437 diff changeset	2001 CGContextConcatCTM(cgcontext, flipVertical);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	2002 CGContextDrawImage(cgcontext, CGRectMake(0,0,size.width,size.height), [image CGImage]);
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	2003 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	2004 return cgcontext;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	2005 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	2006 -(void)dealloc { if(cgcontext) CGContextRelease(cgcontext); if(image) [image release]; [super dealloc]; }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	2007 @end
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2008
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2009 /* Subclass for a scrollbox type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2010 @interface DWScrollBox : UIScrollView
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2011 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2012 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2013 id box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2014 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2015 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2016 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2017 -(void)setBox:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2018 -(id)box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2019 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2020
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2021 @implementation DWScrollBox
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2022 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2023 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2024 -(void)setBox:(void *)input { box = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2025 -(id)box { return box; }
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	2026 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [box removeFromSuperview]; [box release]; [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2027 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2028
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2029 /* Subclass for a entryfield type */
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2030 @interface DWEntryField : UITextField <UITextFieldDelegate>
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2031 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2032 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2033 id clickDefault;
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2034 unsigned long limit;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2035 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2036 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2037 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2038 -(void)setClickDefault:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2039 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2040
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2041 @implementation DWEntryField
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2042 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2043 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2044 -(void)setClickDefault:(id)input { clickDefault = input; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2045 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2046 -(BOOL)textField:(UITextField )textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString )string
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2047 {
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2048 // Prevent crashing undo bug – see note below.
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2049 if(range.length + range.location > textField.text.length)
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2050 return NO;
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2051
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2052 if(limit > 0)
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2053 {
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2054 NSUInteger newLength = [textField.text length] + [string length] - range.length;
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2055 return newLength <= limit;
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2056 }
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2057 return YES;
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2058 }
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2059 -(void)setMaximumLength:(unsigned long)length { limit = length; }
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	2060 -(unsigned long)maximumLength { return limit; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2061 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2062
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2063 /* Subclass for a text and status text type */
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	2064 @interface DWText : UILabel
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2065 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2066 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2067 id clickDefault;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2068 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2069 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2070 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2071 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2072
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2073 @implementation DWText
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2074 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2075 -(void)setUserdata:(void *)input { userdata = input; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2076 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2077 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2078
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2079 /* Subclass for a Notebook page type */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2080 @interface DWNotebookPage : DWBox
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2081 {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2082 int pageid;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2083 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2084 -(int)pageid;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2085 -(void)setPageid:(int)input;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2086 @end
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2087
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2088 /* Subclass for a Notebook control type */
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2089 @interface DWNotebook : UIView
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2090 {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2091 UISegmentedControl *tabs;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2092 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2093 int pageid;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2094 NSMutableArray<DWNotebookPage > views;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2095 DWNotebookPage *visible;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2096 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2097 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2098 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2099 -(int)pageid;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2100 -(void)setPageid:(int)input;
2420 384d076ed52a iOS: Minor fix for initial notebook page remaining visible on page change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2419 diff changeset	2101 -(void)setVisible:(DWNotebookPage *)input;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2102 -(UISegmentedControl *)tabs;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	2103 -(NSMutableArray<DWNotebookPage > )views;
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	2104 -(void)pageChanged:(id)sender;
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	2105 @end
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	2106
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2107 @implementation DWNotebook
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2108 -(id)init {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2109 self = [super init];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2110 tabs = [[[UISegmentedControl alloc] init] retain];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2111 views = [[[NSMutableArray alloc] init] retain];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2112 [self addSubview:tabs];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2113 return self;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2114 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2115 -(void)setFrame:(CGRect)frame {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2116 [super setFrame:frame];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2117 frame.size.height = 40;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2118 [tabs setFrame:frame];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2119 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2120 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2121 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2122 -(int)pageid { return pageid; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2123 -(void)setPageid:(int)input { pageid = input; }
2420 384d076ed52a iOS: Minor fix for initial notebook page remaining visible on page change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2419 diff changeset	2124 -(void)setVisible:(DWNotebookPage *)input { visible = input; }
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2125 -(UISegmentedControl *)tabs { return tabs; }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	2126 -(NSMutableArray<DWNotebookPage > )views { return views; };
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	2127 -(void)pageChanged:(id)sender
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	2128 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2129 NSInteger intpageid = [tabs selectedSegmentIndex];
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2130
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	2131 if(intpageid != -1 && intpageid < [views count])
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2132 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2133 DWNotebookPage *page = [views objectAtIndex:intpageid];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2134
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2135 /* Hide the previously visible page contents */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2136 if(page != visible)
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2137 [visible setHidden:YES];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2138
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2139 /* If the new page is a valid box, lay it out */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2140 if([page isKindOfClass:[DWBox class]])
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2141 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2142 Box *box = [page box];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2143 /* Start with the entire notebook size and then adjust
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2144 * it to account for the segement control's height.
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2145 */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2146 NSInteger height = [tabs frame].size.height;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2147 CGRect frame = [self frame];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2148 frame.origin.y += height;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2149 frame.size.height -= height;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2150 [page setFrame:frame];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2151 [page setHidden:NO];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2152 visible = page;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2153 _dw_do_resize(box, frame.size.width, frame.size.height);
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2154 _dw_handle_resize_events(box);
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2155 }
2693 0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2156 _dw_event_handler(self, DW_INT_TO_POINTER([page pageid]), _DW_EVENT_SWITCH_PAGE);
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2157 }
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2158 else
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2159 visible = nil;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2160 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2161 -(void)dealloc {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2162 UserData *root = userdata;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2163 _dw_remove_userdata(&root, NULL, TRUE);
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2164 dw_signal_disconnect_by_window(self);
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2165 [tabs removeFromSuperview];
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2166 [tabs release];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2167 [views release];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2168 [super dealloc];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2169 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2170 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2171
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2172 @implementation DWNotebookPage
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2173 -(int)pageid { return pageid; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2174 -(void)setPageid:(int)input { pageid = input; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2175 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2176 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2177
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2178 /* Subclass for a splitbar type */
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2179 @interface DWSplitBar : UIView
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2180 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2181 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2182 float percent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2183 NSInteger Tag;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2184 id topleft;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2185 id bottomright;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2186 int splittype;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2187 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2188 -(void)setTag:(NSInteger)tag;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2189 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2190 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2191 -(float)percent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2192 -(void)setPercent:(float)input;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2193 -(id)topLeft;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2194 -(void)setTopLeft:(id)input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2195 -(id)bottomRight;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2196 -(void)setBottomRight:(id)input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2197 -(int)type;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2198 -(void)setType:(int)input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2199 -(void)resize;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2200 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2201
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2202 @implementation DWSplitBar
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2203 -(void)setTag:(NSInteger)tag { Tag = tag; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2204 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2205 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2206 -(float)percent { return percent; }
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2207 -(void)setPercent:(float)input
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2208 {
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2209 percent = input;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2210 if(percent > 100.0)
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2211 percent = 100.0;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2212 else if(percent < 0.0)
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2213 percent = 0.0;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2214 [self resize];
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2215 }
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2216 -(id)topLeft { return topleft; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2217 -(void)setTopLeft:(id)input
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2218 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2219 topleft = input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2220 [self addSubview:topleft];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	2221 [topleft release];
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2222 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2223 -(id)bottomRight { return bottomright; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2224 -(void)setBottomRight:(id)input
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2225 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2226 bottomright = input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2227 [self addSubview:bottomright];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	2228 [bottomright release];
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2229 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2230 -(int)type { return splittype; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2231 -(void)setType:(int)input { splittype = input; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2232 -(void)resize
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2233 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2234 CGRect rect = self.frame;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2235 CGRect half = rect;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2236
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2237 half.origin.x = half.origin.y = 0;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2238
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2239 if(splittype == DW_HORZ)
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2240 half.size.width = (percent/100.0) * rect.size.width;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2241 else
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2242 half.size.height = (percent/100.0) * rect.size.height;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2243 if(topleft)
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2244 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2245 DWBox *view = topleft;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2246 Box *box = [view box];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2247 [topleft setFrame:half];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2248 _dw_do_resize(box, half.size.width, half.size.height);
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2249 _dw_handle_resize_events(box);
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2250 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2251 if(splittype == DW_HORZ)
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2252 {
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2253 half.origin.x = half.size.width;
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2254 half.size.width = rect.size.width - half.size.width;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2255 }
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2256 else
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2257 {
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2258 half.origin.y = half.size.height;
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2259 half.size.height = rect.size.height - half.size.height;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2260 }
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2261 if(bottomright)
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2262 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2263 DWBox *view = bottomright;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2264 Box *box = [view box];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2265 [bottomright setFrame:half];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2266 _dw_do_resize(box, half.size.width, half.size.height);
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2267 _dw_handle_resize_events(box);
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2268 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2269 }
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2270 -(void)dealloc
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2271 {
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2272 UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE);
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2273 dw_signal_disconnect_by_window(self);
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2274 if(topleft)
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2275 {
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2276 [topleft removeFromSuperview];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2277 [topleft release];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2278 }
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2279 if(bottomright)
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2280 {
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2281 [bottomright removeFromSuperview];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2282 [bottomright release];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2283 }
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2284 [super dealloc];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2285 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2286 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2287
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2288 /* Subclass for a slider type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2289 @interface DWSlider : UISlider
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2290 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2291 void *userdata;
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2292 BOOL vertical;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2293 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2294 -(void)setVertical:(BOOL)vert;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2295 -(BOOL)vertical;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2296 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2297 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2298 -(void)sliderChanged:(id)sender;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2299 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2300
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2301 @implementation DWSlider
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2302 -(void)setVertical:(BOOL)vert
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2303 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2304 if(vert)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2305 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2306 CGAffineTransform trans = CGAffineTransformMakeRotation(M_PI * 0.5);
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2307 self.transform = trans;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2308 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2309 vertical = vert;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2310 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2311 -(BOOL)vertical { return vertical; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2312 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2313 -(void)setUserdata:(void *)input { userdata = input; }
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	2314 -(void)sliderChanged:(id)sender { int intVal = (int)[self value]; _dw_event_handler(self, DW_INT_TO_POINTER(intVal), _DW_EVENT_VALUE_CHANGED); }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2315 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2316 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2317
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2318 /* Subclass for a MLE type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2319 @interface DWMLE : UITextView
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2321 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2322 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2323 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2324 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2327 @implementation DWMLE
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2329 -(void)setUserdata:(void *)input { userdata = input; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2330 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2331 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2332
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2333 /* Subclass UITableViewCell so we can support multiple columns...
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2334 * Enabled via the DW_FEATURE_CONTAINER_MODE feature setting.
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2335 */
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2336 @interface DWTableViewCell : UITableViewCell
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2337 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2338 NSMutableArray *columndata;
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2339 UIStackView *stack;
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2340 UILabel *label;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2341 UIImageView *image;
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2342 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2343 -(void)setColumnData:(NSMutableArray *)input;
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2344 -(NSMutableArray *)columnData;
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2345 -(UIImageView *)image;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2346 -(UILabel *)label;
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2347 @end
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2348
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2349 @implementation DWTableViewCell
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2350 -(id)init {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2351 self = [super init];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2352
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2353 image = [[[UIImageView alloc] init] retain];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2354 [image setTranslatesAutoresizingMaskIntoConstraints:NO];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2355 [[self contentView] addSubview:image];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2356
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2357 label = [[[UILabel alloc] init] retain];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2358 [label setTranslatesAutoresizingMaskIntoConstraints:NO];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2359 [[self contentView] addSubview:label];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2360
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2361 stack = [[[UIStackView alloc] init] retain];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2362 [stack setTranslatesAutoresizingMaskIntoConstraints:NO];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2363 [stack setSpacing:5.0];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2364 [[self contentView] addSubview:stack];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2365
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2366 /* Let's use the default margins */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2367 UILayoutGuide *g = [[self contentView] layoutMarginsGuide];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2368
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2369 [NSLayoutConstraint activateConstraints:@[
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2370 /* Constrain label Top/Leading/Trailing to content margins guide */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2371 [image.topAnchor constraintEqualToAnchor:g.topAnchor constant:0.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2372 [image.leadingAnchor constraintEqualToAnchor:g.leadingAnchor constant:0.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2373 [image.trailingAnchor constraintEqualToAnchor:label.leadingAnchor constant:-4.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2374 [label.topAnchor constraintEqualToAnchor:g.topAnchor constant:0.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2375 [label.leadingAnchor constraintEqualToAnchor:image.trailingAnchor constant:4.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2376 /* No Height, because we'll use the label's intrinsic size */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2377
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2378 /* Constrain stack view Top to label bottom plus 8-points */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2379 [stack.topAnchor constraintEqualToAnchor:label.bottomAnchor constant:0.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2380 /* Leading/Trailing/Bottom to content margins guide */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2381 [stack.leadingAnchor constraintEqualToAnchor:g.leadingAnchor constant:0.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2382 [stack.bottomAnchor constraintEqualToAnchor:g.bottomAnchor constant:0.0],
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2383 /* No Height, because we'll use the arranged subviews heights */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2384 ]];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2385 return self;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2386 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2387 -(UILabel *)label { return label; }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2388 -(UIImageView *)image { return image; }
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2389 -(void)setColumnData:(NSMutableArray *)input
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2390 {
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2391 if(columndata != input)
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2392 {
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2393 NSMutableArray *olddata = columndata;
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2394 columndata = input;
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2395 [columndata retain];
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2396 [olddata release];
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2397 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2398 /* If we have columndata and are not in default mode */
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2399 if(columndata && _dw_container_mode > DW_CONTAINER_MODE_DEFAULT)
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2400 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2401 bool extra = _dw_container_mode == DW_CONTAINER_MODE_EXTRA;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2402 id subviews = [stack arrangedSubviews];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2403 int index = 0;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2404
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2405 /* Extra mode stack is horizontal, multi stack is vertical */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2406 [stack setAxis:(extra ? UILayoutConstraintAxisHorizontal : UILayoutConstraintAxisVertical)];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2407
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2408 /* Create the stack using columndata, reusing objects when possible */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2409 for(id object in columndata)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2410 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2411 if([object isKindOfClass:[NSString class]])
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2412 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2413 id label = nil;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2414
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2415 /* Check if we already have a view, reuse it if possible.. */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2416 if(index < [subviews count])
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2417 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2418 id oldview = [subviews objectAtIndex:index];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2419
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2420 if([oldview isMemberOfClass:(extra ? [UILabel class] : [UIButton class])])
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2421 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2422 label = oldview;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2423 /* If we are reusing a button, make sure the image is not set */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2424 if(!extra)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2425 [label setImage:nil forState:UIControlStateNormal];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2426 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2427 else
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2428 [stack removeArrangedSubview:oldview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2429 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2430 if(!label)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2431 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2432 label = extra ? [[UILabel alloc] init] : [UIButton buttonWithType:UIButtonTypeCustom];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2433
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2434 [label setTranslatesAutoresizingMaskIntoConstraints:NO];
2829 c543f7df7867 iOS: Implement layout constraints to put the UIStackView containing the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2827 diff changeset	2435 if(extra)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2436 [label setTextAlignment:NSTextAlignmentCenter];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2437
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2438 if(index < [subviews count])
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2439 [stack insertArrangedSubview:label atIndex:index];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2440 else /* Remove the view if it won't work */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2441 [stack addArrangedSubview:label];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2442 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2443 /* Set the label or button text/title */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2444 if(extra)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2445 [label setText:object];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2446 else
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2447 [label setTitle:object forState:UIControlStateNormal];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2448 index++;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2449 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2450 else if([object isMemberOfClass:[UIImage class]])
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2451 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2452 id image = nil;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2453
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2454 /* Check if we already have a view, reuse it if possible.. */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2455 if(index < [subviews count])
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2456 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2457 id oldview = [subviews objectAtIndex:index];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2458
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2459 if([oldview isMemberOfClass:(extra ? [UIImageView class] : [UIButton class])])
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2460 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2461 image = oldview;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2462 /* If we are reusing a button, make sure the text is not set */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2463 if(!extra)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2464 [image setTitle:nil forState:UIControlStateNormal];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2465 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2466 else /* Remove the view if it won't work */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2467 [stack removeArrangedSubview:oldview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2468 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2469 if(!image)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2470 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2471 image = extra ? [[UIImageView alloc] init] : [UIButton buttonWithType:UIButtonTypeCustom];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2472
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2473 [image setTranslatesAutoresizingMaskIntoConstraints:NO];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2474
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2475 if(index < [subviews count])
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2476 [stack insertArrangedSubview:image atIndex:index];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2477 else
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2478 [stack addArrangedSubview:image];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2479 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2480 /* Set the image view or button image */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2481 if(extra)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2482 [image setImage:object];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2483 else
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2484 [image setImage:image forState:UIControlStateNormal];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2485
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2486 index++;
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2487 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2488 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2489 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2490 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2491 -(NSMutableArray *)columnData { return columndata; }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2492 -(void)dealloc
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2493 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2494 [columndata release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2495 [image removeFromSuperview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2496 [image release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2497 [label removeFromSuperview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2498 [label release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2499 [stack removeFromSuperview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2500 [stack release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2501 [super dealloc];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2502 }
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2503 @end
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2504
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2505 /* Create a tableview cell for containers using DW_CONTAINER_MODE_* or listboxes */
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2506 DWTableViewCell _dw_table_cell_view_new(UIImage icon, NSString text, NSMutableArray columndata)
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2507 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2508 DWTableViewCell *browsercell = [[DWTableViewCell alloc] init];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2509 [browsercell setAutoresizesSubviews:YES];
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	2510
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2511 if(icon)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2512 [[browsercell image] setImage:icon];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2513 if(text)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2514 [[browsercell label] setText:text];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2515 if(columndata)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2516 [browsercell setColumnData:columndata];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2517 return browsercell;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2518 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2519
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2520 /* Subclass for a Container/List type */
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	2521 @interface DWContainer : UITableView <UITableViewDataSource,UITableViewDelegate>
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2522 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2523 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2524 NSMutableArray *tvcols;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2525 NSMutableArray *data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2526 NSMutableArray *types;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2527 NSPointerArray *titles;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2528 NSPointerArray *rowdatas;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2529 UIColor fgcolor, oddcolor, *evencolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2530 unsigned long dw_oddcolor, dw_evencolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2531 unsigned long _DW_COLOR_ROW_ODD, _DW_COLOR_ROW_EVEN;
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2532 int iLastAddPoint, iLastQueryPoint;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2533 int filesystem;
2612 4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2534 NSTimeInterval lastClick;
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2535 NSInteger lastClickRow;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2536 }
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2537 -(NSInteger)tableView:(UITableView *)aTable numberOfRowsInSection:(NSInteger)section;
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2538 -(UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2539 -(void)tableView:(UITableView)tableView willDisplayCell:(UITableViewCell)cell forRowAtIndexPath:(NSIndexPath*)indexPath;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2540 -(UIContextMenuConfiguration )tableView:(UITableView )tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point;
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2541 -(void)addColumn:(NSString *)input andType:(int)type;
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2542 -(NSString *)getColumn:(int)col;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2543 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2544 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2545 -(void)setFilesystem:(int)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2546 -(int)filesystem;
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2547 -(int)addRow:(DWTableViewCell *)input;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2548 -(int)addRows:(int)number;
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2549 -(void)editCell:(id)input at:(int)row;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2550 -(void)removeRow:(int)row;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2551 -(void)setRow:(int)row title:(const char *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2552 -(void *)getRowTitle:(int)row;
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2553 -(id)getRow:(int)row;
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2554 -(NSMutableArray *)getColumns;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2555 -(int)cellType:(int)col;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2556 -(int)lastAddPoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2557 -(int)lastQueryPoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2558 -(void)setLastQueryPoint:(int)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2559 -(void)clear;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2560 -(void)setup;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	2561 -(CGSize)getsize;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2562 -(void)setForegroundColor:(UIColor *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2563 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2564
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2565 @implementation DWContainer
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2566 -(NSInteger)tableView:(UITableView *)aTable numberOfRowsInSection:(NSInteger)section
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2567 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2568 /* Ignoring section for now, everything in one section */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2569 if(tvcols && data)
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2570 return [data count];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2571 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2572 }
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2573 -(UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2574 {
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2575 /* Not reusing cell views, so get the cell from our array */
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2576 int index = (int)indexPath.row;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2577 id celldata = [data objectAtIndex:index];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2578
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2579 /* The data is already a DWTableViewCell so just return that */
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2580 if([celldata isMemberOfClass:[DWTableViewCell class]])
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2581 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2582 DWTableViewCell *result = celldata;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2583
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2584 /* Copy the alignment setting from the column,
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2585 * and set the text color from the container.
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2586 */
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	2587 if(fgcolor)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2588 [[result label] setTextColor:fgcolor];
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	2589
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2590 /* Return the result */
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2591 return result;
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2592 }
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2593 return nil;
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2594 }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2595 -(void)tableView:(UITableView)tableView willDisplayCell:(UITableViewCell)cell forRowAtIndexPath:(NSIndexPath*)indexPath
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2596 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2597 if(indexPath.row % 2 == 0)
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2598 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2599 if(evencolor)
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2600 [cell setBackgroundColor:evencolor];
2678 24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2601 else
24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2602 [cell setBackgroundColor:[UIColor clearColor]];
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2603 }
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2604 else
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2605 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2606 if(oddcolor)
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2607 [cell setBackgroundColor:oddcolor];
2678 24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2608 else
24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2609 [cell setBackgroundColor:[UIColor clearColor]];
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2610 }
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2611 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2612 -(CGFloat)tableView:(UITableView )tableView heightForRowAtIndexPath:(NSIndexPath )indexPath
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2613 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2614 int index = (int)indexPath.row;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2615 id cell = [data objectAtIndex:index];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2616 CGFloat height = 0.0;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2617
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2618 /* The data is already a DWTableViewCell so just return that */
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2619 if([cell isMemberOfClass:[DWTableViewCell class]])
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2620 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2621 height = [[cell contentView] systemLayoutSizeFittingSize:UILayoutFittingCompressedSize].height;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2622 NSLog(@"Calculated height %f\n", (float)height);
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2623 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2624 return height > 0.0 ? height : UITableViewAutomaticDimension;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2625 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2626 -(CGFloat)tableView:(UITableView )tableView estimatedHeightForRowAtIndexPath:(NSIndexPath )indexPath
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2627 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2628 return _dw_container_mode > DW_CONTAINER_MODE_DEFAULT ? 85.0 : 44.0;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2629 }
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2630 -(UIContextMenuConfiguration )tableView:(UITableView )tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2631 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2632 DWWindow window = (DWWindow )[self window];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2633 UIContextMenuConfiguration *config = nil;
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2634 NSPointerArray *params = [NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2635
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2636 [params addPointer:[self getRowTitle:(int)indexPath.row]];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2637 [params addPointer:[self getRowData:(int)indexPath.row]];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2638 [params addPointer:DW_INT_TO_POINTER((int)point.x)];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2639 [params addPointer:DW_INT_TO_POINTER((int)point.y)];
2467 4d1f370bf65e iOS: Pass in the coordinates and row data on container context event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2464 diff changeset	2640
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	2641 _dw_event_point = point;
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2642 _dw_event_handler(self, params, _DW_EVENT_ITEM_CONTEXT);
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2643
2602 cc5013e626f7 iOS: Code cleanup, make sure menu items are enabled on creation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2601 diff changeset	2644 if(window && [window popupMenu])
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2645 {
2600 0bb974e70435 iOS: Fix crash by retaining the UIMenu returned in the block. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2599 diff changeset	2646 __block UIMenu *popupmenu = [[[window popupMenu] menu] retain];
0bb974e70435 iOS: Fix crash by retaining the UIMenu returned in the block. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2599 diff changeset	2647 config = [UIContextMenuConfiguration configurationWithIdentifier:nil
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2648 previewProvider:nil
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2649 actionProvider:^(NSArray* suggestedAction){return popupmenu;}];
2464 4fba0b9453ee iOS: Fix calculating label size when there is no text. Use "gT" to calculate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2463 diff changeset	2650 [window setPopupMenu:nil];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2651 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2652 return config;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2653 }
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2654 -(void)addColumn:(NSString *)input andType:(int)type { if(tvcols) { [tvcols addObject:input]; [types addObject:[NSNumber numberWithInt:type]]; } }
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2655 -(NSString *)getColumn:(int)col { if(tvcols) { return [tvcols objectAtIndex:col]; } return nil; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2656 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2657 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2658 -(void)setFilesystem:(int)input { filesystem = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2659 -(int)filesystem { return filesystem; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2660 -(void)refreshColors
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2661 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2662 UIColor *oldodd = oddcolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2663 UIColor *oldeven = evencolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2664 unsigned long thisodd = dw_oddcolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_ODD : dw_oddcolor;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2665 unsigned long _odd = _dw_get_color(thisodd);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2666 unsigned long thiseven = dw_evencolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_EVEN : dw_evencolor;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2667 unsigned long _even = _dw_get_color(thiseven);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2669 /* Get the UIColor for non-default colors */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2670 if(thisodd != DW_RGB_TRANSPARENT)
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	2671 oddcolor = [[UIColor colorWithRed: DW_RED_VALUE(_odd)/255.0 green: DW_GREEN_VALUE(_odd)/255.0 blue: DW_BLUE_VALUE(_odd)/255.0 alpha: 1] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2672 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2673 oddcolor = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2674 if(thiseven != DW_RGB_TRANSPARENT)
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	2675 evencolor = [[UIColor colorWithRed: DW_RED_VALUE(_even)/255.0 green: DW_GREEN_VALUE(_even)/255.0 blue: DW_BLUE_VALUE(_even)/255.0 alpha: 1] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2676 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2677 evencolor = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2678 [oldodd release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2679 [oldeven release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2680 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2681 -(void)setRowBgOdd:(unsigned long)oddcol andEven:(unsigned long)evencol
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2682 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2683 /* Save the set colors in case we get a theme change */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2684 dw_oddcolor = oddcol;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2685 dw_evencolor = evencol;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2686 [self refreshColors];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2687 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2688 -(void)checkDark
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2689 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2690 /* Update any system colors based on the Dark Mode */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2691 _DW_COLOR_ROW_EVEN = DW_RGB_TRANSPARENT;
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	2692 if(_dw_is_dark())
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	2693 _DW_COLOR_ROW_ODD = DW_RGB(100, 100, 100);
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	2694 else
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	2695 _DW_COLOR_ROW_ODD = DW_RGB(230, 230, 230);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2696 /* Only refresh if we've been setup already */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2697 if(titles)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2698 [self refreshColors];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2699 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2700 -(void)viewDidChangeEffectiveAppearance { [self checkDark]; }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2701 -(int)insertRow:(DWTableViewCell *)input at:(int)index
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2702 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2703 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2704 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2705 if(index < iLastAddPoint)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2706 {
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2707 iLastAddPoint++;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2708 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2709 [data insertObject:input atIndex:index];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2710 [titles insertPointer:NULL atIndex:index];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2711 [rowdatas insertPointer:NULL atIndex:index];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2712 return (int)[titles count];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2713 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2714 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2715 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2716 -(int)addRow:(DWTableViewCell *)input
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2717 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2718 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2719 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2720 iLastAddPoint = (int)[titles count];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2721 [data addObject:input];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2722 [titles addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2723 [rowdatas addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2724 return (int)[titles count];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2725 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2726 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2727 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2728 -(int)addRows:(int)number
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2729 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2730 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2731 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2732 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2733
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2734 iLastAddPoint = (int)[titles count];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2735
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2736 for(z=0;z<number;z++)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2737 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2738 [data addObject:[NSNull null]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2739 [titles addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2740 [rowdatas addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2741 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2742 return (int)[titles count];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2743 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2744 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2745 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2746 -(void)editCell:(id)input at:(int)row
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2747 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2748 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2749 {
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2750 if(row < [data count])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2751 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2752 if(!input)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2753 input = [NSNull null];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2754 [data replaceObjectAtIndex:row withObject:input];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2755 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2756 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2757 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2758 -(void)removeRow:(int)row
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2759 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2760 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2761 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2762 void *oldtitle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2763
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2764 [data removeObjectAtIndex:row];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2765 oldtitle = [titles pointerAtIndex:row];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2766 [titles removePointerAtIndex:row];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2767 [rowdatas removePointerAtIndex:row];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2768 if(iLastAddPoint > 0 && iLastAddPoint > row)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2769 {
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2770 iLastAddPoint--;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2771 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2772 if(oldtitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2773 free(oldtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2774 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2775 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2776 -(void)setRow:(int)row title:(const char *)input
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2777 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2778 if(titles && input)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2779 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2780 void *oldtitle = [titles pointerAtIndex:row];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2781 void newtitle = input ? (void )strdup(input) : NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2782 [titles replacePointerAtIndex:row withPointer:newtitle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2783 if(oldtitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2784 free(oldtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2785 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2786 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2787 -(void)setRowData:(int)row title:(void *)input { if(rowdatas && input) { [rowdatas replacePointerAtIndex:row withPointer:input]; } }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2788 -(void *)getRowTitle:(int)row { if(titles && row > -1) { return [titles pointerAtIndex:row]; } return NULL; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2789 -(void *)getRowData:(int)row { if(rowdatas && row > -1) { return [rowdatas pointerAtIndex:row]; } return NULL; }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2790 -(id)getRow:(int)row { if(data && [data count]) { return [data objectAtIndex:row]; } return nil; }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2791 -(NSMutableArray *)getColumns { return tvcols; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2792 -(int)cellType:(int)col { return [[types objectAtIndex:col] intValue]; }
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2793 -(int)lastAddPoint { return iLastAddPoint; }
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2794 -(int)lastQueryPoint { return iLastQueryPoint; }
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2795 -(void)setLastQueryPoint:(int)input { iLastQueryPoint = input; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2796 -(void)clear
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2797 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2798 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2799 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2800 [data removeAllObjects];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2801 while([titles count])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2802 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2803 void *oldtitle = [titles pointerAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2804 [titles removePointerAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2805 [rowdatas removePointerAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2806 if(oldtitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2807 free(oldtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2808 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2809 }
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2810 iLastAddPoint = 0;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2811 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2812 -(void)setup
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2813 {
2389 7b06fc7c8130 iOS: Remove some legacy code from macOS 10.5 by swithing to using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2388 diff changeset	2814 titles = [[NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory] retain];
7b06fc7c8130 iOS: Remove some legacy code from macOS 10.5 by swithing to using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2388 diff changeset	2815 rowdatas = [[NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2816 tvcols = [[[NSMutableArray alloc] init] retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2817 data = [[[NSMutableArray alloc] init] retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2818 types = [[[NSMutableArray alloc] init] retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2819 if(!dw_oddcolor && !dw_evencolor)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2820 dw_oddcolor = dw_evencolor = DW_CLR_DEFAULT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2821 [self checkDark];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2822 }
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	2823 -(CGSize)getsize
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2824 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2825 int cwidth = 0, cheight = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2826
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2827 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2828 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2829 int colcount = (int)[tvcols count];
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	2830 int rowcount = (int)[self numberOfRowsInSection:0];
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2831 int width = 0;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2832
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2833 if(rowcount > 0)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2834 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2835 int x;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2836
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2837 for(x=0;x<rowcount;x++)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2838 {
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2839 DWTableViewCell cell = [data objectAtIndex:(xcolcount)];
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2840 int thiswidth = 4, thisheight = 0;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2841
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2842 if([cell imageView])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2843 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2844 thiswidth += [[cell image] image].size.width;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2845 thisheight = [[cell image] image].size.height;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2846 }
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2847 if([cell textLabel])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2848 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2849 int textheight = [[cell label] intrinsicContentSize].width;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2850 thiswidth += [[cell label] intrinsicContentSize].width;
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2851 if(textheight > thisheight)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2852 thisheight = textheight;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2853 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2854
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2855 cheight += thisheight;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2856
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2857 if(thiswidth > width)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2858 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2859 width = thiswidth;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2860 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2861 }
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2862 /* If the image is missing default the optimized width to 16. */
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2863 if(!width && [[types objectAtIndex:0] intValue] & DW_CFA_BITMAPORICON)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2864 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2865 width = 16;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2866 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2867 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2868 if(width)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2869 cwidth += width;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2870 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2871 cwidth += 16;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2872 cheight += 16;
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	2873 return CGSizeMake(cwidth, cheight);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2874 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2875 -(void)setForegroundColor:(UIColor *)input
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2876 {
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2877 UIColor *oldfgcolor = fgcolor;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2878
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2879 fgcolor = input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2880 [fgcolor retain];
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2881 [oldfgcolor release];
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2882 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2883 -(void)tableView:(UITableView )tableView didSelectRowAtIndexPath:(NSIndexPath )indexPath
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2884 {
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2885 NSPointerArray *params = [NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2886
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2887 [params addPointer:[self getRowTitle:(int)indexPath.row]];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2888 [params addPointer:[self getRowData:(int)indexPath.row]];
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2889
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2890 /* If multiple selection is enabled, treat it as selectionChanged: */
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2891 if([self allowsMultipleSelection])
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2892 {
2612 4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2893 NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2894
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2895 /* Handler for container class... check for double tap */
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2896 if(lastClickRow == indexPath.row && now - lastClick < 0.3)
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2897 _dw_event_handler(self, params, _DW_EVENT_ITEM_ENTER);
2612 4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2898 else
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2899 _dw_event_handler(self, params, _DW_EVENT_ITEM_SELECT);
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2900 /* Handler for listbox class */
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	2901 _dw_event_handler(self, DW_INT_TO_POINTER((int)indexPath.row), _DW_EVENT_LIST_SELECT);
2612 4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2902 /* Update lastClick for double tap check */
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2903 lastClick = now;
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2904 lastClickRow = indexPath.row;
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2905 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2906 else /* Otherwise treat it as doubleClicked: */
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2907 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2908 /* Handler for container class */
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2909 _dw_event_handler(self, params, _DW_EVENT_ITEM_ENTER);
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2910 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2911 }
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2912 -(void)tableView:(UITableView )tableView didDeselectRowAtIndexPath:(NSIndexPath )indexPath
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2913 {
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2914 if([self allowsMultipleSelection])
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2915 [self tableView:tableView didSelectRowAtIndexPath:indexPath];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2916 }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2917 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2918 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2919
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2920 /* Custom tree view subclasses: DWTree, DWTreeItem, DWTreeViewCell, DWTreeViewCellDelegate */
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2921 @interface DWTreeItem : NSObject
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2922 @property(nonatomic, strong) UIImage *icon;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2923 @property(nonatomic, strong) NSString *title;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2924 @property(nonatomic, assign) void *data;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2925 @property(nonatomic, weak) DWTreeItem *parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2926 @property(nonatomic, retain, readonly) NSMutableArray<DWTreeItem > children;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2927 @property(nonatomic, assign, readonly) NSUInteger levelDepth;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2928 @property(nonatomic, assign, readonly) BOOL isRoot;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2929 @property(nonatomic, assign, readonly) BOOL hasChildren;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2930 @property(nonatomic, assign) BOOL expanded;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2931 -(instancetype)initWithIcon:(UIImage )icon Title:(NSString )title andData:(void *)itemdata;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2932 -(void)insertChildAfter:(DWTreeItem *)treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2933 -(void)appendChild:(DWTreeItem *)newChild;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2934 -(void)removeFromParent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2935 -(void)moveToDestination:(DWTreeItem *)destination;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2936 -(BOOL)containsTreeItem:(DWTreeItem *)treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2937 -(NSArray<DWTreeItem > )visibleNodes;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2938 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2939
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2940 @implementation DWTreeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2941 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2942 NSArray *_flattenedTreeCache;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2943 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2944 -(void)dealloc { NSLog(@"DWTreeItem \"%@\" dealloc", self.title); [_title release]; [_icon release]; [super dealloc]; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2945 -(instancetype)initWithIcon:(UIImage )icon Title:(NSString )title andData:(void *)itemdata
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2946 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2947 if(self = [super init])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2948 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2949 _title = [title retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2950 _icon = [icon retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2951 _data = itemdata;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2952 _children = [[NSMutableArray alloc] initWithCapacity:1];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2953 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2954 return self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2955 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2956 -(NSString *)title
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2957 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2958 if(_title)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2959 return _title;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2960 return self.description;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2961 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2962 -(UIImage *)icon
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2963 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2964 if(_icon)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2965 return _icon;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2966 return nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2967 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2968 -(NSArray<DWTreeItem > )visibleNodes
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2969 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2970 NSMutableArray *allElements = [[NSMutableArray alloc] init];
2766 9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	2971 if(![self isRoot])
9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	2972 [allElements addObject:self];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2973 if(_expanded)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2974 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2975 for (DWTreeItem *child in _children)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2976 [allElements addObjectsFromArray:[child visibleNodes]];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2977 }
2818 d5d09bdd61d6 iOS: Fix a leak in the tree widget. Need to release the flatted tree array. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2817 diff changeset	2978 if(_flattenedTreeCache)
d5d09bdd61d6 iOS: Fix a leak in the tree widget. Need to release the flatted tree array. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2817 diff changeset	2979 [_flattenedTreeCache release];
d5d09bdd61d6 iOS: Fix a leak in the tree widget. Need to release the flatted tree array. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2817 diff changeset	2980 _flattenedTreeCache = allElements;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2981 return allElements;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2982 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2983 -(void)insertChildAfter:(DWTreeItem *)treeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2984 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2985 DWTreeItem *parent = self.parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2986 NSUInteger index = [parent.children indexOfObject:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2987 if(index == NSNotFound)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2988 index = [parent.children count];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2989 treeItem.parent = parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2990 [parent.children insertObject:treeItem atIndex:(index+1)];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2991 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2992 -(void)appendChild:(DWTreeItem *)newChild
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2993 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2994 newChild.parent = self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2995 [_children addObject:newChild];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2996 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2997 -(void)removeFromParent
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2998 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2999 DWTreeItem *parent = self.parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3000 if(parent)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3001 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3002 [parent.children removeObject:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3003 self.parent = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3004 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3005 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3006 -(void)moveToDestination:(DWTreeItem *)destination
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3007 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3008 NSAssert([self containsTreeItem:destination]==NO, @"[self containsTreeItem:destination] something went wrong!");
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3009 if(self == destination \|\| destination == nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3010 return;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3011 [self removeFromParent];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3012
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3013 [destination insertChildAfter:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3014 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3015 -(BOOL)containsTreeItem:(DWTreeItem *)treeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3016 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3017 DWTreeItem *parent = treeItem.parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3018 if(parent == nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3019 return NO;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3020 if(self == parent)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3021 return YES;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3022 return [self containsTreeItem:parent];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3023 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3024 -(NSUInteger)levelDepth
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3025 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3026 NSUInteger cnt = 0;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3027 if(_parent != nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3028 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3029 cnt += 1;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3030 cnt += [_parent levelDepth];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3031 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3032 return cnt;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3033 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3034 -(BOOL)isRoot { return (!_parent); }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3035 -(BOOL)hasChildren { return (_children.count > 0); }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3036 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3037
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3038 @class DWTreeViewCell;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3039 @protocol DWTreeViewCellDelegate <NSObject>
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3040 //@optional
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3041 - (BOOL) queryExpandableInTreeViewCell:(DWTreeViewCell *)treeViewCell;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3042 - (void) treeViewCell:(DWTreeViewCell *)treeViewCell expanded:(BOOL)expanded;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3043 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3044
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3045 @interface DWTreeViewCell : UITableViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3046 @property(nonatomic, strong) UILabel *titleLabel;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3047 @property(nonatomic) NSUInteger level;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3048 @property(nonatomic) BOOL expanded;
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3049 @property(nonatomic) BOOL children;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3050 @property(nonatomic, assign) id <DWTreeViewCellDelegate> delegate;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3051 -(instancetype)initWithStyle:(UITableViewCellStyle)style
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3052 reuseIdentifier:(NSString *)reuseIdentifier
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3053 level:(NSUInteger)level
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3054 expanded:(BOOL)expanded
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3055 children:(BOOL)children;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3056 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3057
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3058 CGRect DWRectInflate(CGRect rect, CGFloat dx, CGFloat dy)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3059 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3060 return CGRectMake(rect.origin.x-dx, rect.origin.y-dy, rect.size.width+2dx, rect.size.height+2dy);
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3061 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3062
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3063 static CGFloat _DW_TREE_IMG_HEIGHT_WIDTH = 20;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3064 static CGFloat _DW_TREE_XOFFSET = 3;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3065
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3066 @implementation DWTreeViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3067 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3068 DWButton *_arrowImageButton;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3069 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3070 -(id)initWithStyle:(UITableViewCellStyle)style
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3071 reuseIdentifier:(NSString *)reuseIdentifier
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3072 level:(NSUInteger)level
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3073 expanded:(BOOL)expanded
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3074 children:(BOOL)children
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3075 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3076 // We should never display the root node
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3077 if(level < 1)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3078 return nil;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3079
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3080 self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3081
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3082 if(self)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3083 {
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3084 _level = level - 1;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3085 _expanded = expanded;
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3086 _children = children;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3087
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3088 UIView *content = self.contentView;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3089
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3090 UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3091 titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3092 titleLabel.numberOfLines = 0;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3093 titleLabel.textAlignment = NSTextAlignmentLeft;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3094 [content addSubview:titleLabel];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3095 _titleLabel = titleLabel;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3096
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3097 DWButton *arrowImageButton = [[DWButton alloc] initWithFrame:CGRectMake(0, 0,
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3098 _DW_TREE_IMG_HEIGHT_WIDTH,
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3099 _DW_TREE_IMG_HEIGHT_WIDTH)];
2794 7ce51a7e8009 iOS: Fix tree control handling clicks on the expand/collapse button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2793 diff changeset	3100 [arrowImageButton addTarget:arrowImageButton
7ce51a7e8009 iOS: Fix tree control handling clicks on the expand/collapse button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2793 diff changeset	3101 action:@selector(buttonClicked:)
7ce51a7e8009 iOS: Fix tree control handling clicks on the expand/collapse button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2793 diff changeset	3102 forControlEvents:UIControlEventTouchUpInside];
7ce51a7e8009 iOS: Fix tree control handling clicks on the expand/collapse button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2793 diff changeset	3103
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3104 [arrowImageButton setType:_DW_BUTTON_TYPE_TREE];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3105 [arrowImageButton setDidCheckedChanged:^(BOOL checked) {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3106 _expanded = checked;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3107 if([_delegate respondsToSelector:@selector(treeViewCell:expanded:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3108 [_delegate treeViewCell:self expanded:checked];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3109 }];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3110 [arrowImageButton setCheckState:_expanded];
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3111 [arrowImageButton setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3112 if(!children)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3113 [arrowImageButton setHidden:YES];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3114 [content addSubview:arrowImageButton];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3115 _arrowImageButton = arrowImageButton;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3116 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3117 return self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3118 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3119 #pragma mark -
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3120 #pragma mark Other overrides
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3121 -(void)layoutSubviews
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3122 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3123 [super layoutSubviews];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3124
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3125 CGSize size = self.contentView.bounds.size;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3126 CGFloat stepSize = size.height;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3127 CGRect rc = CGRectMake(_level * stepSize, 0, stepSize, stepSize);
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3128 _arrowImageButton.frame = DWRectInflate(rc, -_DW_TREE_XOFFSET, -_DW_TREE_XOFFSET);
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3129
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3130 rc = CGRectMake((_level + 1) * stepSize, 0, stepSize, stepSize);
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3131 self.imageView.frame = DWRectInflate(rc, -_DW_TREE_XOFFSET, -_DW_TREE_XOFFSET);
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3132 _titleLabel.frame = CGRectMake((_level + 2) * stepSize, 0, size.width - (_level + 3) * stepSize, stepSize);
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3133 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3134 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3135
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3136 @class DWTree;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3137
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3138 @protocol DWTreeViewDelegate <NSObject>
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3139 @required
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3140 -(NSInteger)numberOfRowsInTreeView:(DWTree *)treeView;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3141 -(DWTreeItem )treeView:(DWTree )treeView treeItemForRow:(NSInteger)row;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3142 -(NSInteger)treeView:(DWTree )treeView rowForTreeItem:(DWTreeItem )treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3143 -(void)treeView:(DWTree )treeView removeTreeItem:(DWTreeItem )treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3144 -(void)treeView:(DWTree )treeView moveTreeItem:(DWTreeItem )treeItem to:(DWTreeItem *)to;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3145 -(void)treeView:(DWTree )treeView addTreeItem:(DWTreeItem )treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3146 -(void)treeView:(DWTree )treeView didSelectForTreeItem:(DWTreeItem )treeItem;
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3147 -(UIContextMenuConfiguration )treeView:(DWTree )treeView contextMenuConfigurationForTreeItem:(DWTreeItem *)treeItem point:(CGPoint)point;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3148 -(BOOL)treeView:(DWTree )treeView queryExpandableInTreeItem:(DWTreeItem )treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3149 -(void)treeView:(DWTree )treeView treeItem:(DWTreeItem )treeItem expanded:(BOOL)expanded;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3150 @optional
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3151 -(BOOL)treeView:(DWTree )treeView canEditTreeItem:(DWTreeItem )treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3152 -(BOOL)treeView:(DWTree )treeView canMoveTreeItem:(DWTreeItem )treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3153 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3154
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3155 @interface DWTree : UITableView
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3156 @property(nonatomic, strong) UIFont *font;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3157 @property(nonatomic, strong) DWTreeItem *treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3158 @property(nonatomic, weak) id<DWTreeViewDelegate> treeViewDelegate;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3159 -(instancetype)initWithFrame:(CGRect)frame;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3160 -(void)insertTreeItem:(DWTreeItem *)treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3161 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3162
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3163 @interface DWTree () <UITableViewDataSource, UITableViewDelegate, DWTreeViewCellDelegate, DWTreeViewDelegate>
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3164 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3165
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3166 @implementation DWTree
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3167 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3168 DWTreeItem *_rootNode;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3169 DWTreeItem *_selectedNode;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3170 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3171 -(instancetype)initWithFrame:(CGRect)frame
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3172 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3173 if(self = [super initWithFrame:frame])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3174 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3175 self.delegate=self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3176 self.dataSource=self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3177 _treeViewDelegate=self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3178 self.separatorStyle= UITableViewCellSeparatorStyleNone;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3179 _font = [UIFont systemFontOfSize:16];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3180 _rootNode = [[[DWTreeItem alloc] initWithIcon:nil Title:@"@Root" andData:NULL] retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3181 _rootNode.expanded = YES;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3182 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3183 return self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3184 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3185 -(void)dealloc { [_rootNode release]; [super dealloc]; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3186 -(void)insertTreeItem:(DWTreeItem *)treeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3187 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3188 DWTreeItem *targetNode = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3189
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3190 if([self window])
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3191 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3192 NSArray<DWTreeViewCell > cells = [self visibleCells];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3193
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3194 // Target the selected tree node first if any
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3195 for(DWTreeViewCell *cell in cells)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3196 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3197 DWTreeItem *iter = [self treeItemForTreeViewCell:cell];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3198 if(iter == _selectedNode)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3199 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3200 targetNode = iter;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3201 break;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3202 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3203 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3204 // Otherwise target first visible node if any
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3205 if(targetNode == nil && [cells count])
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3206 targetNode = [self treeItemForTreeViewCell:cells[0]];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3207 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3208 // Finally put it on the root level
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3209 if(targetNode == nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3210 targetNode = _rootNode;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3211 // If target is still nil something went horrible wrong
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3212 NSAssert(targetNode, @"targetNode == nil, something went wrong!");
2766 9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	3213 if(targetNode.isRoot)
9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	3214 [targetNode appendChild:treeItem];
9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	3215 else
9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	3216 [targetNode insertChildAfter:treeItem];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3217
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3218 if([_treeViewDelegate respondsToSelector:@selector(treeView:addTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3219 [_treeViewDelegate treeView:self addTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3220
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3221 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3222 [self resetSelection:NO];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3223 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3224 -(void)setFont:(UIFont *)font
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3225 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3226 _font = font;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3227 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3228 [self resetSelection:NO];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3229 }
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3230 -(void)clear
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3231 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3232 [[_rootNode children] removeAllObjects];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3233 [self reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3234 [self resetSelection:NO];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3235 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3236 -(void)resetSelection:(BOOL)delay
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3237 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3238 NSInteger row = NSNotFound;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3239 if([_treeViewDelegate respondsToSelector:@selector(treeView:rowForTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3240 row = [_treeViewDelegate treeView:self rowForTreeItem:_selectedNode];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3241 if(row != NSNotFound)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3242 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3243 NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:0];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3244 dispatch_block_t run = ^ {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3245 [self selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3246 };
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3247 if(delay)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3248 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), run);
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3249 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3250 run();
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3251 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3252 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3253 #pragma mark - DWTreeViewDelegate
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3254 -(NSInteger)numberOfRowsInTreeView:(DWTree *)treeView { return [_rootNode visibleNodes].count; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3255 -(void)treeView:(DWTree )treeView addTreeItem:(DWTreeItem )treeItem {}
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3256 -(void)treeView:(DWTree )treeView didSelectForTreeItem:(DWTreeItem )treeItem
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3257 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3258 if(treeItem)
2772 af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3259 {
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3260 const char *title = [[treeItem title] UTF8String];
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3261 NSPointerArray *params = [NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory];
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3262
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3263 [params addPointer:strdup(title ? title : "")];
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3264 [params addPointer:[treeItem data]];
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3265 [params addPointer:treeItem];
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3266 _dw_event_handler(treeView, params, _DW_EVENT_ITEM_SELECT);
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3267 free([params pointerAtIndex:0]);
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3268 }
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3269 }
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3270 -(UIContextMenuConfiguration )treeView:(DWTree )treeView contextMenuConfigurationForTreeItem:(DWTreeItem *)treeItem point:(CGPoint)point
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3271 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3272 UIContextMenuConfiguration *config = nil;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3273 DWWindow window = (DWWindow )[self window];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3274 const char *title = [[treeItem title] UTF8String];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3275 NSPointerArray *params = [NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3276
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3277 [params addPointer:strdup(title ? title : "")];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3278 [params addPointer:[treeItem data]];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3279 [params addPointer:DW_INT_TO_POINTER((int)point.x)];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3280 [params addPointer:DW_INT_TO_POINTER((int)point.y)];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3281
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3282 _dw_event_point = point;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3283 _dw_event_handler(self, params, _DW_EVENT_ITEM_CONTEXT);
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3284 free([params pointerAtIndex:0]);
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3285
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3286 if(window && [window popupMenu])
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3287 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3288 __block UIMenu *popupmenu = [[[window popupMenu] menu] retain];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3289 config = [UIContextMenuConfiguration configurationWithIdentifier:nil
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3290 previewProvider:nil
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3291 actionProvider:^(NSArray* suggestedAction){return popupmenu;}];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3292 [window setPopupMenu:nil];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3293 }
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3294 return config;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3295 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3296 -(void)treeView:(DWTree )treeView moveTreeItem:(DWTreeItem )treeItem to:(DWTreeItem *)to {}
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3297 -(BOOL)treeView:(DWTree )treeView queryExpandableInTreeItem:(DWTreeItem )treeItem { return YES; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3298 -(void)treeView:(DWTree )treeView removeTreeItem:(DWTreeItem )treeItem {}
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3299 -(NSInteger)treeView:(DWTree )treeView rowForTreeItem:(DWTreeItem )treeItem { return [[_rootNode visibleNodes] indexOfObject:treeItem]; }
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3300 -(void)treeView:(DWTree )treeView treeItem:(DWTreeItem )treeItem expanded:(BOOL)expanded
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3301 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3302 if(treeItem)
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3303 _dw_event_handler(treeView, (void *)treeItem, _DW_EVENT_TREE_EXPAND);
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3304 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3305 - (DWTreeItem )treeView:(DWTree )treeView treeItemForRow:(NSInteger)row { return [[_rootNode visibleNodes] objectAtIndex:row]; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3306 #pragma mark - UITableViewDataSource
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3307 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { return 1; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3308 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3309 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3310 NSInteger count = 0;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3311 if([_treeViewDelegate respondsToSelector:@selector(numberOfRowsInTreeView:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3312 count = [_treeViewDelegate numberOfRowsInTreeView:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3313 return count;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3314 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3315 -(UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3316 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3317 static NSString *CellIdentifier = @"Cell";
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3318
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3319 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3320 DWTreeViewCell *cell = [[DWTreeViewCell alloc] initWithStyle:UITableViewCellStyleDefault
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3321 reuseIdentifier:CellIdentifier
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3322 level:[treeItem levelDepth]
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3323 expanded:treeItem.expanded
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3324 children:[treeItem hasChildren]];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3325 cell.titleLabel.text = treeItem.title;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3326 cell.imageView.image = treeItem.icon;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3327 cell.titleLabel.font = _font;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3328 //cell.selectionStyle = UITableViewCellSelectionStyleNone;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3329 cell.delegate = self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3330 return cell;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3331 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3332 -(BOOL)tableView:(UITableView )tableView canEditRowAtIndexPath:(NSIndexPath )indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3333 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3334 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3335 if([_treeViewDelegate respondsToSelector:@selector(treeView:canEditTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3336 return [_treeViewDelegate treeView:self canEditTreeItem:treeItem];
2769 06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	3337 return NO;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3338 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3339 -(void)tableView:(UITableView )tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath )indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3340 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3341 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3342 if(editingStyle == UITableViewCellEditingStyleDelete)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3343 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3344 [treeItem removeFromParent];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3345 if([_treeViewDelegate respondsToSelector:@selector(treeView:removeTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3346 [_treeViewDelegate treeView:self removeTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3347 if(treeItem.expanded && treeItem.hasChildren)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3348 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3349 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3350 [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3351 [self resetSelection:YES];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3352 } else if (editingStyle == UITableViewCellEditingStyleInsert) {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3353 // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3354 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3355 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3356 -(void)tableView:(UITableView )tableView moveRowAtIndexPath:(NSIndexPath )fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3357 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3358 if([fromIndexPath isEqual:toIndexPath])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3359 return;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3360 DWTreeItem *srcNode = [self treeItemForIndexPath:fromIndexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3361 DWTreeItem *targetNode = [self treeItemForIndexPath:toIndexPath];
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3362
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3363 if(srcNode && targetNode)
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3364 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3365 [srcNode moveToDestination:targetNode];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3366
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3367 if([_treeViewDelegate respondsToSelector:@selector(treeView:moveTreeItem:to:)])
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3368 [_treeViewDelegate treeView:self moveTreeItem:srcNode to:targetNode];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3369
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3370 [self reloadData];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3371 [self resetSelection:NO];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3372 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3373 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3374 -(BOOL)tableView:(UITableView )tableView canMoveRowAtIndexPath:(NSIndexPath )indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3375 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3376 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3377 if(treeItem && [_treeViewDelegate respondsToSelector:@selector(treeView:canMoveTreeItem:)])
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3378 return [_treeViewDelegate treeView:self canMoveTreeItem:treeItem];
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3379 return NO;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3380 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3381 #pragma mark - DWTableViewDelegate
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3382 -(void)tableView:(UITableView )tableView didSelectRowAtIndexPath:(NSIndexPath )indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3383 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3384 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3385 if(treeItem && [_treeViewDelegate respondsToSelector:@selector(treeView:didSelectForTreeItem:)])
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3386 [_treeViewDelegate treeView:self didSelectForTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3387 _selectedNode = treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3388 }
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3389 -(UIContextMenuConfiguration )tableView:(UITableView )tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3390 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3391 UIContextMenuConfiguration *config = nil;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3392 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3393 if(treeItem && [_treeViewDelegate respondsToSelector:@selector(treeView:contextMenuConfigurationForTreeItem:point:)])
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3394 config = [_treeViewDelegate treeView:self contextMenuConfigurationForTreeItem:treeItem point:point];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3395
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3396 return config;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3397 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3398 -(NSIndexPath )tableView:(UITableView )tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath )sourceIndexPath toProposedIndexPath:(NSIndexPath )proposedDestinationIndexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3399 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3400 DWTreeItem *srcNode = [self treeItemForIndexPath:sourceIndexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3401 DWTreeItem *targetNode = [self treeItemForIndexPath:proposedDestinationIndexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3402 if([srcNode containsTreeItem:targetNode] \|\| srcNode==targetNode)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3403 return sourceIndexPath;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3404 // NSLog(@"Moving to target node \"%@\"", targetNode.title);
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3405 return proposedDestinationIndexPath;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3406 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3407 #pragma mark - DWTreeViewCellDelegate
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3408 -(BOOL)queryExpandableInTreeViewCell:(DWTreeViewCell *)treeViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3409 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3410 BOOL allow = YES;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3411 if([_treeViewDelegate respondsToSelector:@selector(treeView:queryExpandableInTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3412 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3413 DWTreeItem *treeItem = [self treeItemForTreeViewCell:treeViewCell];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3414 allow = [_treeViewDelegate treeView:self queryExpandableInTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3415 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3416 return allow;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3417 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3418 -(void)treeViewCell:(DWTreeViewCell *)treeViewCell expanded:(BOOL)expanded
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3419 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3420 DWTreeItem *treeItem = [self treeItemForTreeViewCell:treeViewCell];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3421 treeItem.expanded = expanded;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3422 if(treeItem.hasChildren)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3423 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3424 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3425 [self resetSelection:NO];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3426 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3427 if([_treeViewDelegate respondsToSelector:@selector(treeView:treeItem:expanded:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3428 [_treeViewDelegate treeView:self treeItem:treeItem expanded:expanded];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3429 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3430 #pragma mark - retrieve TreeItem object from special cell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3431 -(DWTreeItem )treeItemForTreeViewCell:(DWTreeViewCell )treeViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3432 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3433 NSIndexPath *indexPath = [self indexPathForCell:treeViewCell];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3434 return [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3435 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3436 -(DWTreeItem )treeItemForIndexPath:(NSIndexPath )indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3437 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3438 DWTreeItem *treeItem = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3439 if([_treeViewDelegate respondsToSelector:@selector(treeView:treeItemForRow:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3440 treeItem = [_treeViewDelegate treeView:self treeItemForRow:indexPath.row];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3441 NSAssert(treeItem, @"Can't get the Tree Node data");
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3442 return treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3443 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3444 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3445
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3446 /* Subclass for a Calendar type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3447 @interface DWCalendar : UIDatePicker
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3448 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3449 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3450 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3451 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3453 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3454
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3455 @implementation DWCalendar
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3456 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3457 -(void)setUserdata:(void *)input { userdata = input; }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3458 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3459 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3460
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3461 /* Subclass for a stepper component of the spinbutton type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3462 /* This is a bad way of doing this... but I can't get the other methods to work */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3463 @interface DWStepper : UIStepper
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465 id textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3466 id parent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3467 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3468 -(void)setTextfield:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3469 -(id)textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3470 -(void)setParent:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3471 -(id)parent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3473
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3474 @implementation DWStepper
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3475 -(void)setTextfield:(id)input { textfield = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476 -(id)textfield { return textfield; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477 -(void)setParent:(id)input { parent = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3478 -(id)parent { return parent; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3479 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3480
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3481 /* Subclass for a Spinbutton type */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3482 @interface DWSpinButton : UIView <UITextFieldDelegate>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3483 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3484 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3485 UITextField *textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3486 DWStepper *stepper;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3487 id clickDefault;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3488 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3489 -(id)init;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3490 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3492 -(UITextField *)textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3493 -(UIStepper *)stepper;
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3494 -(void)textFieldDidEndEditing:(UITextField *)textField;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3495 -(void)setClickDefault:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3496 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3497
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3498 @implementation DWSpinButton
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3499 -(id)init
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3500 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 self = [super init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3502
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3503 if(self)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3504 {
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3505 textfield = [[UITextField alloc] init];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3506 [self addSubview:textfield];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3507 stepper = [[DWStepper alloc] init];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508 [self addSubview:stepper];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3509 [stepper setParent:self];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 [stepper setTextfield:textfield];
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	3511 [textfield setText:[NSString stringWithFormat:@"%ld",(long)[stepper value]]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3512 [textfield setDelegate:self];
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3513 [stepper addTarget:self action:@selector(stepperChanged:) forControlEvents:UIControlEventValueChanged];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3514 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3515 return self;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3516 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3517 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3518 -(void)setUserdata:(void *)input { userdata = input; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3519 -(UITextField *)textfield { return textfield; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3520 -(UIStepper *)stepper { return stepper; }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3521 -(void)textFieldDidEndEditing:(UITextField *)textField
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3522 {
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	3523 long val = [[textfield text] intValue];
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	3524 [stepper setValue:(float)val];
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3525 [textfield setText:[NSString stringWithFormat:@"%d", (int)[stepper value]]];
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	3526 _dw_event_handler(self, DW_INT_TO_POINTER((int)[stepper value]), _DW_EVENT_VALUE_CHANGED);
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3527 }
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3528 -(void)stepperChanged:(UIStepper*)theStepper
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3529 {
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3530 [textfield setText:[NSString stringWithFormat:@"%d", (int)[theStepper value]]];
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	3531 _dw_event_handler(self, DW_INT_TO_POINTER((int)[stepper value]), _DW_EVENT_VALUE_CHANGED);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3532 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3533 -(void)setClickDefault:(id)input { clickDefault = input; }
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3534 -(void)dealloc
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3535 {
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3536 UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE);
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3537 dw_signal_disconnect_by_window(self);
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3538 [textfield removeFromSuperview];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3539 [textfield release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3540 [stepper removeFromSuperview];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3541 [stepper release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3542 [super dealloc];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3543 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3545
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3546 API_AVAILABLE(ios(10.0))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3547 @interface DWUserNotificationCenterDelegate : NSObject <UNUserNotificationCenterDelegate>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3548 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3549
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3550 @implementation DWUserNotificationCenterDelegate
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3551 /* Called when a notification is delivered to a foreground app. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3552 -(void)userNotificationCenter:(UNUserNotificationCenter )center willPresentNotification:(UNNotification )notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler API_AVAILABLE(macos(10.14))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3553 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3554 completionHandler(UNAuthorizationOptionSound \| UNAuthorizationOptionAlert \| UNAuthorizationOptionBadge);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3555 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3556 /* Called to let your app know which action was selected by the user for a given notification. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3557 -(void)userNotificationCenter:(UNUserNotificationCenter )center didReceiveNotificationResponse:(UNNotificationResponse )response withCompletionHandler:(void(^)(void))completionHandler API_AVAILABLE(macos(10.14))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3558 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3559 NSScanner *objScanner = [NSScanner scannerWithString:response.notification.request.identifier];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3560 unsigned long long handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3561 HWND notification;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3562
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3563 /* Skip the dw-notification- prefix */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3564 [objScanner scanString:@"dw-notification-" intoString:nil];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3565 [objScanner scanUnsignedLongLong:&handle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3566 notification = DW_UINT_TO_POINTER(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3567
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3568 if ([response.actionIdentifier isEqualToString:UNNotificationDismissActionIdentifier])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3569 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3570 /* The user dismissed the notification without taking action. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3571 dw_signal_disconnect_by_window(notification);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3572 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3573 else if ([response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3574 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575 /* The user launched the app. */
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	3576 _dw_event_handler(notification, nil, _DW_EVENT_CLICKED);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 dw_signal_disconnect_by_window(notification);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3578 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 completionHandler();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3580 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3581 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3582
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3583 @interface DWComboBox : UITextField <UIPickerViewDelegate,UIPickerViewDataSource,UITextFieldDelegate>
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3584 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3585 UIPickerView* pickerView;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3586 NSMutableArray* dataArray;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3587 UIBarStyle toolbarStyle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3588 int selectedIndex;
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3589 void *userdata;
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3590 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3591 -(void)setToolbarStyle:(UIBarStyle)style;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3592 -(void)append:(NSString *)item;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3593 -(void)insert:(NSString *)item atIndex:(int)index;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3594 -(void)clear;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3595 -(int)count;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3596 -(NSString *)getTextAtIndex:(int)index;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3597 -(void)setText:(NSString *)item atIndex:(int)index;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3598 -(void)deleteAtIndex:(int)index;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3599 -(int)selectedIndex;
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3600 -(void *)userdata;
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3601 -(void)setUserdata:(void *)input;
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3602 @end
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3603
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3604 @implementation DWComboBox
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3605 -(id)init
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3606 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3607 self = [super init];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3608 if(self)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3609 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3610 [self setDelegate:self];
2433 87669cfe3c92 iOS: Combobox remove code to hide the input caret. Also fix the cancel button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2432 diff changeset	3611
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3612 /* Set UI defaults */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3613 toolbarStyle = UIBarStyleDefault;
2442 725a6fbb44cd iOS: DWComboBox needs to initialize the array so the list works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2440 diff changeset	3614 dataArray = [[NSMutableArray alloc] init];
2433 87669cfe3c92 iOS: Combobox remove code to hide the input caret. Also fix the cancel button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2432 diff changeset	3615
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3616 /* Setup the arrow image */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3617 UIButton *imageButton = [UIButton buttonWithType:UIButtonTypeCustom];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3618 UIImage *image = [UIImage systemImageNamed:@"chevron.down"];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3619 [imageButton setImage:image forState:UIControlStateNormal];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3620 [self setRightView:imageButton];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3621 [self setRightViewMode:UITextFieldViewModeAlways];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3622 [imageButton addTarget:self action:@selector(showPicker:) forControlEvents:UIControlEventTouchUpInside];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3623 selectedIndex = -1;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3624 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3625 return self;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3626 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3627 -(void)setToolbarStyle:(UIBarStyle)style { toolbarStyle = style; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3628 -(void)append:(NSString *)item { if(item) [dataArray addObject:item]; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3629 -(void)insert:(NSString *)item atIndex:(int)index { if(item) [dataArray insertObject:item atIndex:index]; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3630 -(void)clear { [dataArray removeAllObjects]; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3631 -(int)count { return (int)[dataArray count]; }
2804 deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3632 -(void)selectIndex:(int)index
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3633 {
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3634 if(index > -1 && index < (int)[dataArray count])
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3635 {
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3636 selectedIndex = index;
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3637 [self setText:[dataArray objectAtIndex:index]];
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3638 }
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3639 }
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3640 -(NSString *)getTextAtIndex:(int)index
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3641 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3642 if(index > -1 && index < [dataArray count])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3643 return [dataArray objectAtIndex:index];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3644 return nil;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3645 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3646 -(void)setText:(NSString *)item atIndex:(int)index
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3647 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3648 if(item && index > -1 && index < [dataArray count])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3649 [dataArray replaceObjectAtIndex:index withObject:item];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3650 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3651 -(void)deleteAtIndex:(int)index { if(index > -1 && index < [dataArray count]) [dataArray removeObjectAtIndex:index]; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3652 -(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView { return 1; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3653 -(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3654 {
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3655 if(row > -1 && row < [dataArray count])
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3656 {
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3657 selectedIndex = (int)row;
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3658 [self setText:[dataArray objectAtIndex:row]];
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3659 [self sendActionsForControlEvents:UIControlEventValueChanged];
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3660 _dw_event_handler(self, DW_INT_TO_POINTER(selectedIndex), _DW_EVENT_LIST_SELECT);
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3661 }
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3662 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3663 -(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component { return [dataArray count]; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3664 -(NSString )pickerView:(UIPickerView )pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3665 {
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3666 if(row > -1 && row < [dataArray count])
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3667 return [dataArray objectAtIndex:row];
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3668 return nil;
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3669 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3670 -(void)doneClicked:(id)sender
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3671 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3672 /* Hides the pickerView */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3673 [self resignFirstResponder];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3674
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3675 if([[self text] length] == 0 \|\| ![dataArray containsObject:[self text]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3676 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3677 selectedIndex = -1;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3678 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3679 [self sendActionsForControlEvents:UIControlEventValueChanged];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3680 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3681 -(void)cancelClicked:(id)sender
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3682 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3683 /* Hides the pickerView */
2433 87669cfe3c92 iOS: Combobox remove code to hide the input caret. Also fix the cancel button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2432 diff changeset	3684 [self resignFirstResponder];
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3685 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3686 -(void)showPicker:(id)sender
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3687 {
2738 c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3688 [self resignFirstResponder];
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3689
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3690 pickerView = [[UIPickerView alloc] init];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3691 [pickerView setDataSource:self];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3692 [pickerView setDelegate:self];
2738 c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3693
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3694 /* If the text field is empty show the place holder otherwise show the last selected option */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3695 if([[self text] length] == 0 \|\| ![dataArray containsObject:[self text]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3696 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3697 [pickerView selectRow:0 inComponent:0 animated:YES];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3698 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3699 else
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3700 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3701 if([dataArray containsObject:[self text]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3702 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3703 [pickerView selectRow:[dataArray indexOfObject:[self text]] inComponent:0 animated:YES];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3704 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3705 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3706
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3707 UIToolbar* toolbar = [[UIToolbar alloc] init];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3708 [toolbar setBarStyle:toolbarStyle];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3709
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3710 /* Space between buttons */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3711 UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3712 target:nil
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3713 action:nil];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3714
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3715 UIBarButtonItem *doneButton = [[UIBarButtonItem alloc]
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3716 initWithTitle:@"Done"
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3717 style:UIBarButtonItemStyleDone
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3718 target:self
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3719 action:@selector(doneClicked:)];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3720
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3721 UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc]
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3722 initWithTitle:@"Cancel"
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3723 style:UIBarButtonItemStylePlain
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3724 target:self
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3725 action:@selector(cancelClicked:)];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3726
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3727 [toolbar setItems:[NSArray arrayWithObjects:cancelButton, flexibleSpace, doneButton, nil]];
2738 c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3728 [toolbar sizeToFit];
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3729
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3730 /* Custom input view */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3731 [self setInputView:pickerView];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3732 [self setInputAccessoryView:toolbar];
2738 c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3733 [super becomeFirstResponder];
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3734 }
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3735 -(BOOL)becomeFirstResponder
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3736 {
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3737 [self setInputView:nil];
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3738 [self setInputAccessoryView:nil];
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3739 return [super becomeFirstResponder];
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3740 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3741 -(int)selectedIndex { return selectedIndex; }
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3742 -(void *)userdata { return userdata; }
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3743 -(void)setUserdata:(void *)input { userdata = input; }
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3744 -(void)dealloc
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3745 {
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3746 UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE);
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3747 dw_signal_disconnect_by_window(self);
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3748 [dataArray release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3749 [super dealloc];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3750 }
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3751 @end
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3752
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3753 /* Subclass for a MDI type
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3754 * This is just a box for display purposes... but it is a
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3755 * unique class so it can be identified when creating windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3757 @interface DWMDI : DWBox {}
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3758 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3759
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3760 @implementation DWMDI
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3761 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3762
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3763 /* This function adds a signal handler callback into the linked list.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3764 */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3765 void _dw_new_signal(ULONG message, HWND window, int msgid, void signalfunction, void discfunc, void *data)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	3767 DWSignalHandler *new = malloc(sizeof(DWSignalHandler));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 new->message = message;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3770 new->window = window;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 new->id = msgid;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772 new->signalfunction = signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 new->discfunction = discfunc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3774 new->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3775 new->next = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3776
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3777 if (!DWRoot)
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3778 DWRoot = new;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3779 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3780 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	3781 DWSignalHandler prev = NULL, tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3784 if(tmp->message == message &&
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3785 tmp->window == window &&
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3786 tmp->id == msgid &&
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3787 tmp->signalfunction == signalfunction)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3788 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3789 tmp->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3790 free(new);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3791 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3792 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3793 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3794 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3796 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 prev->next = new;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798 else
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3799 DWRoot = new;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3801 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 /* Finds the message number for a given signal name */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3804 ULONG _dw_findsigmessage(const char *signame)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3805 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3806 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3807
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3808 for(z=0;z<SIGNALMAX;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3809 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3810 if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3811 return DWSignalTranslate[z].message;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3812 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3813 return 0L;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3814 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3815
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3816 unsigned long _dw_foreground = 0xAAAAAA, _dw_background = 0;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3817
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3818 void _dw_handle_resize_events(Box *thisbox)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3819 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3820 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3821
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3822 for(z=0;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3823 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 id handle = thisbox->items[z].hwnd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3825
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	3826 if(thisbox->items[z].type == _DW_TYPE_BOX)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3827 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3828 Box tmp = (Box )[handle box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3829
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3830 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3831 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3832 _dw_handle_resize_events(tmp);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3833 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3834 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3835 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3836 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3837 if([handle isMemberOfClass:[DWRender class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3838 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 DWRender render = (DWRender )handle;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	3840 CGSize oldsize = [render size];
8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	3841 CGSize newsize = [render frame].size;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3843 /* Eliminate duplicate configure requests */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3844 if(oldsize.width != newsize.width \|\| oldsize.height != newsize.height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3845 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3846 if(newsize.width > 0 && newsize.height > 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3847 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3848 [render setSize:newsize];
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	3849 _dw_event_handler(handle, nil, _DW_EVENT_CONFIGURE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3850 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3851 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3852 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3853 /* Special handling for notebook controls */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3854 else if([handle isMemberOfClass:[DWNotebook class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3855 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3856 DWNotebook *notebook = handle;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3857 NSInteger intpageid = [[notebook tabs] selectedSegmentIndex];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3858
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	3859 if(intpageid != -1 && intpageid < [[notebook views] count])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3860 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3861 DWNotebookPage *page = [[notebook views] objectAtIndex:intpageid];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3862
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3863 if([page isKindOfClass:[DWBox class]])
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3864 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3865 Box *box = [page box];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3866 _dw_handle_resize_events(box);
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3867 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3868 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3869 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3870 /* Handle laying out scrollviews... if required space is less
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3871 * than available space, then expand. Otherwise use required space.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3872 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3873 else if([handle isMemberOfClass:[DWScrollBox class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3874 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3875 DWScrollBox scrollbox = (DWScrollBox )handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	3876 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	3877 DWBox *contentbox = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3878 Box *thisbox = [contentbox box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3879
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880 /* Get the required space for the box */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3881 _dw_handle_resize_events(thisbox);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3882 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3885 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3887 /* This function calculates how much space the widgets and boxes require
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3888 * and does expansion as necessary.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3889 */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3890 static void _dw_resize_box(Box thisbox, int depth, int x, int y, int pass)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3891 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3892 /* Current item position */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3893 int z, currentx = thisbox->pad, currenty = thisbox->pad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3894 /* Used x, y and padding maximum values...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3895 * These will be used to find the widest or
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3896 * tallest items in a box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3897 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3898 int uymax = 0, uxmax = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3899 int upymax = 0, upxmax = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3900
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3901 /* Reset the box sizes */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3902 thisbox->minwidth = thisbox->minheight = thisbox->usedpadx = thisbox->usedpady = thisbox->pad * 2;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3903
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3904 /* Count up all the space for all items in the box */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3905 for(z=0;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3906 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3907 int itempad, itemwidth, itemheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3908
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	3909 if(thisbox->items[z].type == _DW_TYPE_BOX)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3911 id box = thisbox->items[z].hwnd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 Box tmp = (Box )[box box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3913
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3914 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3915 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3916 /* On the first pass calculate the box contents */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3917 if(pass == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3918 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3919 (*depth)++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3920
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3921 /* Save the newly calculated values on the box */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3922 _dw_resize_box(tmp, depth, x, y, pass);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3923
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3924 /* Duplicate the values in the item list for use below */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925 thisbox->items[z].width = tmp->minwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926 thisbox->items[z].height = tmp->minheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3928 /* If the box has no contents but is expandable... default the size to 1 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3929 if(!thisbox->items[z].width && thisbox->items[z].hsize)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3930 thisbox->items[z].width = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931 if(!thisbox->items[z].height && thisbox->items[z].vsize)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3932 thisbox->items[z].height = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3933
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3934 (*depth)--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3935 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3936 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3937 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3938
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3939 /* Precalculate these values, since they will
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3940 * be used used repeatedly in the next section.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3941 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3942 itempad = thisbox->items[z].pad * 2;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3943 itemwidth = thisbox->items[z].width + itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3944 itemheight = thisbox->items[z].height + itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3945
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3946 /* Calculate the totals and maximums */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3947 if(thisbox->type == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3948 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3949 if(itemwidth > uxmax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3950 uxmax = itemwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3951
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	3952 if(thisbox->items[z].hsize != _DW_SIZE_EXPAND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3953 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3954 if(itemwidth > upxmax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3955 upxmax = itemwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3956 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3957 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3958 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3959 if(itempad > upxmax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960 upxmax = itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3961 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 thisbox->minheight += itemheight;
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	3963 if(thisbox->items[z].vsize != _DW_SIZE_EXPAND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 thisbox->usedpady += itemheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 thisbox->usedpady += itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3967 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3968 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3969 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3970 if(itemheight > uymax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3971 uymax = itemheight;
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	3972 if(thisbox->items[z].vsize != _DW_SIZE_EXPAND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3974 if(itemheight > upymax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3975 upymax = itemheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3976 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3977 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3978 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3979 if(itempad > upymax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3980 upymax = itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3981 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3982 thisbox->minwidth += itemwidth;
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	3983 if(thisbox->items[z].hsize != _DW_SIZE_EXPAND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3984 thisbox->usedpadx += itemwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3986 thisbox->usedpadx += itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3987 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3988 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3989
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3990 /* Add the maximums which were calculated in the previous loop */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3991 thisbox->minwidth += uxmax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3992 thisbox->minheight += uymax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3993 thisbox->usedpadx += upxmax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3994 thisbox->usedpady += upymax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3995
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3996 /* The second pass is for actual placement. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3997 if(pass > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3998 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3999 for(z=0;z<(thisbox->count);z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4000 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4001 int height = thisbox->items[z].height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4002 int width = thisbox->items[z].width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4003 int itempad = thisbox->items[z].pad * 2;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 int thispad = thisbox->pad * 2;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4005
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006 /* Calculate the new sizes */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4007 if(thisbox->items[z].hsize == _DW_SIZE_EXPAND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4008 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4009 if(thisbox->type == DW_HORZ)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4010 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4011 int expandablex = thisbox->minwidth - thisbox->usedpadx;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4012
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4013 if(expandablex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4014 width = (int)(((float)width / (float)expandablex) * (float)(x - thisbox->usedpadx));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4015 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4016 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4017 width = x - (itempad + thispad + thisbox->grouppadx);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4018 }
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4019 if(thisbox->items[z].vsize == _DW_SIZE_EXPAND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4020 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4021 if(thisbox->type == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4022 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4023 int expandabley = thisbox->minheight - thisbox->usedpady;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4025 if(expandabley)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4026 height = (int)(((float)height / (float)expandabley) * (float)(y - thisbox->usedpady));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4029 height = y - (itempad + thispad + thisbox->grouppady);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4030 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 /* If the calculated size is valid... */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033 if(height > 0 && width > 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4035 int pad = thisbox->items[z].pad;
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4036 id handle = thisbox->items[z].hwnd;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4037 CGRect rect;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4038
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4039 rect.origin.x = currentx + pad;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4040 rect.origin.y = currenty + pad;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4041 rect.size.width = width;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4042 rect.size.height = height;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4043 [handle setFrame:rect];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4044
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4045 /* After placing a box... place its components */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4046 if(thisbox->items[z].type == _DW_TYPE_BOX)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4047 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4048 id box = thisbox->items[z].hwnd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4049 Box tmp = (Box )[box box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4050
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4051 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4052 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4053 (*depth)++;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4054 _dw_resize_box(tmp, depth, width, height, pass);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055 (*depth)--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4056 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4057 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4058
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4059 /* Special handling for notebook controls */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4060 if([handle isMemberOfClass:[DWNotebook class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4061 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4062 DWNotebook *notebook = handle;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4063 NSInteger intpageid = [[notebook tabs] selectedSegmentIndex];
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4064
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4065 if(intpageid == -1)
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4066 {
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4067 if([[notebook tabs] numberOfSegments] > 0)
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4068 {
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4069 DWNotebookPage *notepage = [[notebook views] firstObject];
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4070
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4071 /* If there is no selected segment, select the first one... */
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4072 [[notebook tabs] setSelectedSegmentIndex:0];
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4073 intpageid = 0;
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4074 [notepage setHidden:NO];
2420 384d076ed52a iOS: Minor fix for initial notebook page remaining visible on page change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2419 diff changeset	4075 [notebook setVisible:notepage];
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4076 }
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4077 }
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4078
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4079 if(intpageid != -1 && intpageid < [[notebook views] count])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4080 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4081 DWNotebookPage *page = [[notebook views] objectAtIndex:intpageid];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4082
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4083 /* If the new page is a valid box, lay it out */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4084 if([page isKindOfClass:[DWBox class]])
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4085 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4086 Box *box = [page box];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4087 /* Start with the entire notebook size and then adjust
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4088 * it to account for the segement control's height.
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4089 */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4090 NSInteger height = [[notebook tabs] frame].size.height;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4091 CGRect frame = [notebook frame];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4092 frame.origin.y += height;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4093 frame.size.height -= height;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4094 [page setFrame:frame];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4095 _dw_do_resize(box, frame.size.width, frame.size.height);
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4096 _dw_handle_resize_events(box);
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4097 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4098 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4099 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4100 /* Handle laying out scrollviews... if required space is less
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4101 * than available space, then expand. Otherwise use required space.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4102 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4103 else if([handle isMemberOfClass:[DWScrollBox class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4104 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4105 int depth = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4106 DWScrollBox scrollbox = (DWScrollBox )handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4107 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4108 DWBox *contentbox = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4109 Box *thisbox = [contentbox box];
2448 7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4110 /* We start with the content being the available size */
7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4111 CGRect frame = CGRectMake(0,0,rect.size.width,rect.size.height);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4112
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4113 /* Get the required space for the box */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4114 _dw_resize_box(thisbox, &depth, x, y, 1);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4115
2448 7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4116 /* Expand the content box to the size of the contents */
7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4117 if(frame.size.width < thisbox->minwidth)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4118 {
2448 7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4119 frame.size.width = thisbox->minwidth;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4120 }
2448 7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4121 if(frame.size.height < thisbox->minheight)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4122 {
2448 7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4123 frame.size.height = thisbox->minheight;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4124 }
2449 6edaa9382046 iOS: Fix scrolling the scrollbox. Make sure scrolling is enabled and set the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2448 diff changeset	4125 [scrollbox setContentSize:frame.size];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4126 [contentbox setFrame:frame];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4127
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128 /* Layout the content of the scrollbox */
2448 7e1828dd4fe0 iOS: Fix scrollbox content not expanding to take the full area if smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2447 diff changeset	4129 _dw_do_resize(thisbox, frame.size.width, frame.size.height);
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4130 _dw_handle_resize_events(thisbox);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4131 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4132 /* Special handling for spinbutton controls */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4133 else if([handle isMemberOfClass:[DWSpinButton class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4134 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4135 DWSpinButton spinbutton = (DWSpinButton )handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4136 UITextField *textfield = [spinbutton textfield];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4137 UIStepper *stepper = [spinbutton stepper];
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4138 NSInteger stepperwidth = [stepper intrinsicContentSize].width;
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4139 [textfield setFrame:CGRectMake(0,0,rect.size.width-stepperwidth,rect.size.height)];
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4140 [stepper setFrame:CGRectMake(rect.size.width-stepperwidth,0,stepperwidth,rect.size.height)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4141 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4142 else if([handle isMemberOfClass:[DWSplitBar class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4143 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4144 DWSplitBar split = (DWSplitBar )handle;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	4145 [split resize];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4146 }
2700 246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4147 else if([handle isMemberOfClass:[DWMLE class]])
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4148 {
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4149 DWMLE mle = (DWMLE )handle;
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4150
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4151 if([[mle textContainer] lineBreakMode] == NSLineBreakByClipping)
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4152 [[mle textContainer] setSize:CGRectInfinite.size];
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4153 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4154
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4155 /* Advance the current position in the box */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4156 if(thisbox->type == DW_HORZ)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4157 currentx += width + (pad * 2);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4158 if(thisbox->type == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4159 currenty += height + (pad * 2);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4160 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4161 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4162 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4163 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4164
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4165 static void _dw_do_resize(Box *thisbox, int x, int y)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4166 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4167 if(x > 0 && y > 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 if(thisbox)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 int depth = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4173 /* Calculate space requirements */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4174 _dw_resize_box(thisbox, &depth, x, y, 1);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4176 /* Finally place all the boxes and controls */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4177 _dw_resize_box(thisbox, &depth, x, y, 2);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4178 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4179 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4180 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4181
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4182 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4183 * Runs a message loop for Dynamic Windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4184 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4185 void API dw_main(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4186 {
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4187 /* We don't actually run a loop here,
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4188 * we launched a new thread to run the loop there.
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4189 * Just wait for dw_main_quit() on the DWMainEvent.
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4190 */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4191 dw_event_wait(DWMainEvent, DW_TIMEOUT_INFINITE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4192 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4193
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4194 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4195 * Causes running dw_main() to return.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4196 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4197 void API dw_main_quit(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 {
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4199 dw_event_post(DWMainEvent);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4202 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4203 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4204 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 * milliseconds: Number of milliseconds to run the loop for.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4207 void API dw_main_sleep(int milliseconds)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 DWTID curr = pthread_self();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4210
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4211 if(DWThread == (DWTID)-1 \|\| DWThread == curr)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4212 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213 DWTID orig = DWThread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4214 NSDate *until = [NSDate dateWithTimeIntervalSinceNow:(milliseconds/1000.0)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4216 if(orig == (DWTID)-1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4217 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4218 DWThread = curr;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4219 }
2648 2362cb4b7ef9 iOS: Fix another _dw_main_iteration() loop issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2647 diff changeset	4220 /* Process any pending events */
2362cb4b7ef9 iOS: Fix another _dw_main_iteration() loop issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2647 diff changeset	4221 _dw_main_iteration(until);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4222 if(orig == (DWTID)-1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4223 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224 DWThread = orig;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4225 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4226 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4228 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229 usleep(milliseconds * 1000);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4231 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4232
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4233 /* Internal version that doesn't lock the run mutex */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4234 int _dw_main_iteration(NSDate *date)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4235 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	4236 return [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:date];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4237 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4238
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4239 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4240 * Processes a single message iteration and returns.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4241 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4242 void API dw_main_iteration(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4243 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4244 DWTID curr = pthread_self();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4245
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4246 if(DWThread == (DWTID)-1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4247 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4248 DWThread = curr;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4249 _dw_main_iteration([NSDate distantPast]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4250 DWThread = (DWTID)-1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4251 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4252 else if(DWThread == curr)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4253 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4254 _dw_main_iteration([NSDate distantPast]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4255 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4256 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4257
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4258 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4259 * Cleanly terminates a DW session, should be signal handler safe.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4261 void API dw_shutdown(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4262 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4263 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4264
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4265 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4266 * Cleanly terminates a DW session, should be signal handler safe.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4268 * exitcode: Exit code reported to the operating system.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4269 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4270 void API dw_exit(int exitcode)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 dw_shutdown();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4273 exit(exitcode);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4275
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4277 * Free's memory allocated by dynamic windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4278 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 * ptr: Pointer to dynamic windows allocated
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280 * memory to be free()'d.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4282 void API dw_free(void *ptr)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4283 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 free(ptr);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4285 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4286
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4287 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4288 * Returns a pointer to a static buffer which containes the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4289 * current user directory. Or the root directory (C:\ on
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4290 * OS/2 and Windows).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4291 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4292 char *dw_user_dir(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4293 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4294 static char _user_dir[PATH_MAX+1] = { 0 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 if(!_user_dir[0])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4297 {
2787 56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4298 NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4299 NSUserDomainMask, YES);
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4300 NSString *nshome = [paths firstObject];
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4301 const char *home;
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4302
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4303 if(nshome && (home = [nshome UTF8String]))
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4304 strncpy(_user_dir, home, PATH_MAX);
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4305 else if((nshome = NSHomeDirectory()) && (home = [nshome UTF8String]))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4306 strncpy(_user_dir, home, PATH_MAX);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4307 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4308 strcpy(_user_dir, "/");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4309 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4310 return _user_dir;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4311 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4312
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4313 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4314 * Returns a pointer to a static buffer which containes the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4315 * private application data directory.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4316 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4317 char * API dw_app_dir(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319 return _dw_bundle_path;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4320 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4321
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4323 * Sets the application ID used by this Dynamic Windows application instance.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 * appid: A string typically in the form: com.company.division.application
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 * appname: The application name used on Windows or NULL.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4327 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4328 * DW_ERROR_NONE after successfully setting the application ID.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329 * DW_ERROR_UNKNOWN if unsupported on this system.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330 * DW_ERROR_GENERAL if the application ID is not allowed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4331 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332 * This must be called before dw_init(). If dw_init() is called first
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4333 * it will create a unique ID in the form: org.dbsoft.dwindows.application
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 * or if the application name cannot be detected: org.dbsoft.dwindows.pid.#
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4335 * The appname is only required on Windows. If NULL is passed the detected
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4336 * application name will be used, but a prettier name may be desired.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4337 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4338 int dw_app_id_set(const char appid, const char appname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4339 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4340 strncpy(_dw_app_id, appid, _DW_APP_ID_SIZE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4341 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4342 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4344 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4345 * Displays a debug message on the console...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4346 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4347 * format: printf style format string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4348 * ...: Additional variables for use in the format.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4349 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4350 void API dw_debug(const char *format, ...)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4352 va_list args;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4353 char outbuf[1025] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4354
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4355 va_start(args, format);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4356 vsnprintf(outbuf, 1024, format, args);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4357 va_end(args);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4358
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4359 NSLog(@"%s", outbuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4360 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4361
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4362 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4363 * Displays a Message Box with given text and title..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4364 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365 * title: The title of the message box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4366 * flags: flags to indicate buttons and icon
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4367 * format: printf style format string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4368 * ...: Additional variables for use in the format.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4369 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 int API dw_messagebox(const char title, int flags, const char format, ...)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4371 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4372 NSInteger iResponse;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 NSString *button1 = @"OK";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4374 NSString *button2 = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375 NSString *button3 = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376 NSString *mtitle = [NSString stringWithUTF8String:title];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4377 NSString *mtext;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4378 UIAlertControllerStyle mstyle = UIAlertControllerStyleAlert;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379 NSArray *params;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4380 va_list args;
2725 2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4381 static int in_mb = FALSE;
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4382
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4383 /* Prevent recursion */
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4384 if(in_mb)
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4385 return 0;
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4386 in_mb = TRUE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4387
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4388 if(flags & DW_MB_OKCANCEL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4389 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4390 button2 = @"Cancel";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4391 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4392 else if(flags & DW_MB_YESNO)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4393 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4394 button1 = @"Yes";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4395 button2 = @"No";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4396 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4397 else if(flags & DW_MB_YESNOCANCEL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4398 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4399 button1 = @"Yes";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4400 button2 = @"No";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4401 button3 = @"Cancel";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4402 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4403
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4404 va_start(args, format);
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	4405 mtext = [[NSString alloc] initWithFormat:[NSString stringWithUTF8String:format] arguments:args];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4406 va_end(args);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4407
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4408 params = [NSMutableArray arrayWithObjects:mtitle, mtext, [NSNumber numberWithInteger:mstyle], button1, button2, button3, nil];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4409 [DWObj safeCall:@selector(messageBox:) withObject:params];
2725 2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4410 in_mb = FALSE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4411 iResponse = [[params lastObject] integerValue];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4412
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4413 switch(iResponse)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4414 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4415 case 1: /* user pressed OK */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4416 if(flags & DW_MB_YESNO \|\| flags & DW_MB_YESNOCANCEL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4417 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4418 return DW_MB_RETURN_YES;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420 return DW_MB_RETURN_OK;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4421 case 2: /* user pressed Cancel */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 if(flags & DW_MB_OKCANCEL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4423 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4424 return DW_MB_RETURN_CANCEL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4425 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4426 return DW_MB_RETURN_NO;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4427 case 3: /* user pressed the third button */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4428 return DW_MB_RETURN_CANCEL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4429 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4430 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4431 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4432
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4433 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4434 * Opens a file dialog and queries user selection.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4435 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4436 * title: Title bar text for dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4437 * defpath: The default path of the open dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4438 * ext: Default file extention.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4439 * flags: DW_FILE_OPEN or DW_FILE_SAVE.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4440 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441 * NULL on error. A malloced buffer containing
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4442 * the file path on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4443 *
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4444 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4445 char * API dw_file_browse(const char title, const char defpath, const char *ext, int flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4446 {
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4447 NSPointerArray *params = [[NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory] retain];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4448 char *file = NULL;
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4449
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4450 [params addPointer:(void *)defpath];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4451 [params addPointer:(void *)ext];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4452 [params addPointer:DW_INT_TO_POINTER(flags)];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4453 [DWObj safeCall:@selector(filePicker:) withObject:params];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4454 if([params count] > 3)
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4455 file = [params pointerAtIndex:3];
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4456
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4457 return file;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4458 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4459
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4460 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4461 * Gets the contents of the default clipboard as text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4462 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4463 * None.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4464 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4465 * Pointer to an allocated string of text or NULL if clipboard empty or contents could not
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4466 * be converted to text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4467 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4468 char *dw_clipboard_get_text()
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4470 UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4471 NSString *str = [pasteboard string];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 if(str != nil)
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4473 return strdup([str UTF8String]);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4475 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4476
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4477 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4478 * Sets the contents of the default clipboard to the supplied text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4479 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4480 * Text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4481 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4482 void dw_clipboard_set_text(const char *str, int len)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4483 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4484 UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4485
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4486 [pasteboard setString:[NSString stringWithUTF8String:str]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4487 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4488
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4489
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4491 * Allocates and initializes a dialog struct.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4492 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4493 * data: User defined data to be passed to functions.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4494 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4495 DWDialog * API dw_dialog_new(void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4496 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4497 DWDialog *tmp = malloc(sizeof(DWDialog));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4498
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4499 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4500 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4501 tmp->eve = dw_event_new();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4502 dw_event_reset(tmp->eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4503 tmp->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4504 tmp->done = FALSE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4505 tmp->result = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4506 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4507 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4508 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4509
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4510 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4511 * Accepts a dialog struct and returns the given data to the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4512 * initial called of dw_dialog_wait().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4513 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4514 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4515 * result: Data to be returned by dw_dialog_wait().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4516 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4517 int API dw_dialog_dismiss(DWDialog dialog, void result)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4518 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4519 dialog->result = result;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4520 dw_event_post(dialog->eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4521 dialog->done = TRUE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4522 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4523 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4524
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4525 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4526 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4527 * called by a signal handler with the given dialog struct.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4528 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4529 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4530 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4531 void * API dw_dialog_wait(DWDialog *dialog)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4532 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4533 void *tmp = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4534
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4535 if(dialog)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4536 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4537 while(!dialog->done)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4538 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4539 _dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4541 dw_event_close(&dialog->eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4542 tmp = dialog->result;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4543 free(dialog);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4544 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4545 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4546 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4547
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4548 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4549 * Create a new Box to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4550 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4551 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4552 * pad: Number of pixels to pad around the box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4553 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4554 DW_FUNCTION_DEFINITION(dw_box_new, HWND, int type, int pad)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4555 DW_FUNCTION_ADD_PARAM2(type, pad)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4556 DW_FUNCTION_RETURN(dw_box_new, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4557 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4558 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4559 DW_FUNCTION_INIT;
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	4560 DWBox *view = [[[DWBox alloc] init] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4561 Box *newbox = [view box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4562 memset(newbox, 0, sizeof(Box));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4563 newbox->pad = pad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4564 newbox->type = type;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4565 DW_FUNCTION_RETURN_THIS(view);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4566 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4567
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4568 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4569 * Create a new Group Box to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4570 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4571 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4572 * pad: Number of pixels to pad around the box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4573 * title: Text to be displayined in the group outline.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4574 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4575 HWND API dw_groupbox_new(int type, int pad, const char *title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4576 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	4577 return dw_box_new(type, pad);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4578 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4579
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4580 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4581 * Create a new scrollable Box to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4582 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4583 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4584 * pad: Number of pixels to pad around the box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4585 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4586 DW_FUNCTION_DEFINITION(dw_scrollbox_new, HWND, int type, int pad)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4587 DW_FUNCTION_ADD_PARAM2(type, pad)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4588 DW_FUNCTION_RETURN(dw_scrollbox_new, HWND)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4589 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4590 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	4591 DWScrollBox *scrollbox = [[[DWScrollBox alloc] init] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4592 DWBox *box = dw_box_new(type, pad);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4593 DWBox *tmpbox = dw_box_new(DW_VERT, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4594 dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4595 [scrollbox setBox:box];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4596 [scrollbox addSubview:tmpbox];
2449 6edaa9382046 iOS: Fix scrolling the scrollbox. Make sure scrolling is enabled and set the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2448 diff changeset	4597 [scrollbox setScrollEnabled:YES];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	4598 [tmpbox release];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4599 DW_FUNCTION_RETURN_THIS(scrollbox);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4600 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4601
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4602 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4603 * Returns the position of the scrollbar in the scrollbox
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4604 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4605 * handle: Handle to the scrollbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4606 * orient: The vertical or horizontal scrollbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4607 */
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4608 DW_FUNCTION_DEFINITION(dw_scrollbox_get_pos, int, HWND handle, int orient)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4609 DW_FUNCTION_ADD_PARAM2(handle, orient)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4610 DW_FUNCTION_RETURN(dw_scrollbox_get_pos, int)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4611 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, orient, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4612 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4613 DWScrollBox *scrollbox = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4614 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4615 UIView *view = [subviews firstObject];
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	4616 CGSize contentsize = [scrollbox contentSize];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4617 CGPoint contentoffset = [scrollbox contentOffset];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4618 int range = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4619 int val = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4620 if(orient == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4621 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4622 range = [view bounds].size.height - contentsize.height;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4623 val = contentoffset.y;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4624 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4625 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4626 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4627 range = [view bounds].size.width - contentsize.width;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4628 val = contentoffset.x;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4629 }
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4630 if(val > range)
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4631 {
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4632 val = range;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4633 }
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4634 DW_FUNCTION_RETURN_THIS(val);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4635 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4636
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4637 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4638 * Gets the range for the scrollbar in the scrollbox.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4639 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4640 * handle: Handle to the scrollbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4641 * orient: The vertical or horizontal scrollbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4642 */
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4643 DW_FUNCTION_DEFINITION(dw_scrollbox_get_range, int, HWND handle, int orient)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4644 DW_FUNCTION_ADD_PARAM2(handle, orient)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4645 DW_FUNCTION_RETURN(dw_scrollbox_get_range, int)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4646 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, orient, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4647 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4648 DWScrollBox *scrollbox = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4649 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4650 UIView *view = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4651 int range = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4652 if(orient == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4653 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4654 range = [view bounds].size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4655 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4656 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4657 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4658 range = [view bounds].size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4659 }
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4660 DW_FUNCTION_RETURN_THIS(range);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4661 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4662
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4663 /* Return the handle to the text object */
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	4664 id _dw_text_handle(id object)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4665 {
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4666 if([object isMemberOfClass:[DWButton class]])
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4667 {
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4668 DWButton *button = object;
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4669 object = [button titleLabel];
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4670 }
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4671 else if([object isMemberOfClass:[DWSpinButton class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4672 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4673 DWSpinButton *spinbutton = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4674 object = [spinbutton textfield];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4675 }
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4676 #if 0 /* TODO: Fix this when we have a groupbox implemented */
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4677 if([object isMemberOfClass:[NSBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4678 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4679 NSBox *box = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4680 id content = [box contentView];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4681
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4682 if([content isMemberOfClass:[DWText class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4683 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4684 object = content;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4685 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4686 }
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4687 #endif
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4688 return object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4689 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4690
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4691 /* Internal function to calculate the widget's required size..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4692 * These are the general rules for widget sizes:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4693 *
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4694 * Render/Unspecified: 1x1
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4695 * Scrolled(Container,Tree,MLE): Guessed size clamped to min and max in dw.h
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4696 * Entryfield/Combobox/Spinbutton: 150x(maxfontheight)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4697 * Spinbutton: 50x(maxfontheight)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4698 * Text/Status: (textwidth)x(textheight)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4699 * Ranged: 100x14 or 14x100 for vertical.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4700 * Buttons/Bitmaps: Size of text or image and border.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4701 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4702 void _dw_control_size(id handle, int width, int height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4703 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4704 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4705 NSString *nsstr = nil;
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	4706 id object = _dw_text_handle(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4707
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4708 /* Handle all the different button types */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4709 if([handle isMemberOfClass:[DWButton class]])
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4710 {
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4711 UIImage *image = [handle imageForState:UIControlStateNormal];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4712
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4713 if(image)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4714 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4715 /* Image button */
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4716 CGSize size = [image size];
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4717 extrawidth = (int)size.width + 1;
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4718 /* Height isn't additive */
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4719 thisheight = (int)size.height + 1;
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4720 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4721 /* Text button */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4722 nsstr = [[handle titleLabel] text];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4723
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4724 if(nsstr && [nsstr length] > 0)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4725 {
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4726 /* With combined text/image we seem to
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4727 * need a lot of additional width space.
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4728 */
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4729 if(image)
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4730 extrawidth += 30;
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4731 else
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4732 extrawidth += 8;
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4733 extraheight += 4;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4734 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4735 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4736 /* If the control is an entryfield set width to 150 */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4737 else if([object isKindOfClass:[UITextField class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4738 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739 UIFont *font = [object font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4740
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4741 if([object isEditable])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4742 {
2430 e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4743 /* Spinbutton text doesn't need to be as wide */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4744 if([handle isMemberOfClass:[DWSpinButton class]])
2430 e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4745 thiswidth = 50;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4746 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4747 thiswidth = 150;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4748 }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4749 nsstr = [object text];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4750
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4751 if(font)
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4752 thisheight = (int)[font lineHeight];
2467 4d1f370bf65e iOS: Pass in the coordinates and row data on container context event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2464 diff changeset	4753
2430 e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4754 /* Spinbuttons need some extra */
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4755 if([handle isMemberOfClass:[DWSpinButton class]])
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4756 {
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4757 DWSpinButton *spinbutton = handle;
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4758 CGSize size = [[spinbutton stepper] intrinsicContentSize];
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4759
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4760 /* Add the stepper width as extra... */
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4761 extrawidth = size.width;
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4762 /* The height should be the bigger of the two */
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4763 if(size.height > thisheight)
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4764 thisheight = size.height;
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4765 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4766 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4767 /* Handle the ranged widgets */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4768 else if([object isMemberOfClass:[DWPercent class]] \|\|
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4769 [object isMemberOfClass:[DWSlider class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4770 {
2541 2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4771 if([object isMemberOfClass:[DWSlider class]] && [object vertical])
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4772 {
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4773 thiswidth = 25;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4774 thisheight = 100;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4775 }
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4776 else
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4777 {
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4778 thiswidth = 100;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4779 thisheight = 25;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4780 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4781 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4782 /* Handle bitmap size */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4783 else if([object isMemberOfClass:[UIImageView class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4784 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4785 UIImage image = (UIImage )[object image];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4786
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4787 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4788 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	4789 CGSize size = [image size];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4790 thiswidth = (int)size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4791 thisheight = (int)size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4792 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4793 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4794 /* Handle calendar */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4795 else if([object isMemberOfClass:[DWCalendar class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4796 {
2588 8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4797 DWCalendar *calendar = object;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4798 CGSize size = [calendar intrinsicContentSize];
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4799
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4800 /* If we can't detect the size... */
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4801 if(size.width < 1 \|\| size.height < 1)
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4802 {
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4803 if(DWOSMajor >= 14)
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4804 {
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4805 /* Bigger new style in ios 14 */
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4806 thiswidth = 200;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4807 thisheight = 200;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4808 }
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4809 else
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4810 {
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4811 /* Smaller spinner style in iOS 13 and earlier */
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4812 thiswidth = 200;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4813 thisheight = 100;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4814 }
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4815 }
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4816 else
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4817 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4818 thiswidth = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4819 thisheight = size.height;
2588 8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4820 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4821 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4822 /* MLE and Container */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4823 else if([object isMemberOfClass:[DWMLE class]] \|\|
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4824 [object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4825 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	4826 CGSize size;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4827
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4828 if([object isMemberOfClass:[DWMLE class]])
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	4829 size = [object contentSize];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4830 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4831 size = [object getsize];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4832
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4833 thiswidth = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4834 thisheight = size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4835
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4836 if(thiswidth < _DW_SCROLLED_MIN_WIDTH)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4837 thiswidth = _DW_SCROLLED_MIN_WIDTH;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4838 if(thiswidth > _DW_SCROLLED_MAX_WIDTH)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4839 thiswidth = _DW_SCROLLED_MAX_WIDTH;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4840 if(thisheight < _DW_SCROLLED_MIN_HEIGHT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4841 thisheight = _DW_SCROLLED_MIN_HEIGHT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4842 if(thisheight > _DW_SCROLLED_MAX_HEIGHT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4843 thisheight = _DW_SCROLLED_MAX_HEIGHT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4844 }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4845 else if([object isKindOfClass:[UILabel class]])
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4846 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4847 nsstr = [object text];
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4848 extrawidth = extraheight = 2;
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4849 }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4850 #ifdef DW_INCLUDE_DEPRECATED
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4851 /* Any other control type */
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4852 else if([object isKindOfClass:[UIControl class]])
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4853 nsstr = [object text];
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4854 #endif
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4855
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4856 /* If we have a string...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4857 * calculate the size with the current font.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4858 */
2464 4fba0b9453ee iOS: Fix calculating label size when there is no text. Use "gT" to calculate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2463 diff changeset	4859 if(nsstr)
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4860 {
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4861 int textwidth, textheight;
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4862
2464 4fba0b9453ee iOS: Fix calculating label size when there is no text. Use "gT" to calculate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2463 diff changeset	4863 /* If we have an empty string, use "gT" to get the most height for the font */
4fba0b9453ee iOS: Fix calculating label size when there is no text. Use "gT" to calculate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2463 diff changeset	4864 dw_font_text_extents_get(object, NULL, [nsstr length] ? (char *)[nsstr UTF8String] : "gT", &textwidth, &textheight);
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4865
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4866 if(textheight > thisheight)
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4867 thisheight = textheight;
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4868 if(textwidth > thiswidth)
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4869 thiswidth = textwidth;
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4870 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4871
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4872 /* Set the requested sizes */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4873 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4874 *width = thiswidth + extrawidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4875 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4876 *height = thisheight + extraheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4877 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4878
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4879 /* Internal box packing function called by the other 3 functions */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4880 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4881 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4882 id object = box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4883 DWBox *view = box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4884 DWBox *this = item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4885 Box *thisbox;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886 int z, x = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887 Item tmpitem, thisitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4888
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4889 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 * If you try and pack an item into itself VERY bad things can happen; like at least an
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4891 * infinite loop on GTK! Lets be safe!
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 if(box == item)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4895 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4896 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4897 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4898
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899 /* Query the objects */
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4900 if([object isKindOfClass:[UIWindow class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4901 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4902 UIWindow *window = box;
2599 32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	4903 NSArray *subviews = [[[window rootViewController] view] subviews];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4904 view = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 }
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4906 else if([object isMemberOfClass:[DWScrollBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4907 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 DWScrollBox *scrollbox = box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909 view = [scrollbox box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4911
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4912 thisbox = [view box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4914 object = item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4915
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4916 /* Do some sanity bounds checking */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4917 if(!thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4918 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4919 if(index < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4920 index = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4921 if(index > thisbox->count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4922 index = thisbox->count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 /* Duplicate the existing data */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925 tmpitem = calloc(sizeof(Item), (thisbox->count+1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4926
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4927 for(z=0;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4928 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4929 if(z == index)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4930 x++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4931 tmpitem[x] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4932 x++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4933 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4934
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4935 /* Sanity checks */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4936 if(vsize && !height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4937 height = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 if(hsize && !width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4939 width = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4941 /* Fill in the item data appropriately */
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	4942 if([object isKindOfClass:[DWBox class]])
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4943 tmpitem[index].type = _DW_TYPE_BOX;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4945 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	4946 if(width == 0 && hsize == FALSE)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4947 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	4948 if(height == 0 && vsize == FALSE)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4949 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4950
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4951 tmpitem[index].type = _DW_TYPE_ITEM;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4952 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4953
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4954 tmpitem[index].hwnd = item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4955 tmpitem[index].origwidth = tmpitem[index].width = width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 tmpitem[index].origheight = tmpitem[index].height = height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4957 tmpitem[index].pad = pad;
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4958 tmpitem[index].hsize = hsize ? _DW_SIZE_EXPAND : _DW_SIZE_STATIC;
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4959 tmpitem[index].vsize = vsize ? _DW_SIZE_EXPAND : _DW_SIZE_STATIC;
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4960
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4961 /* If either of the parameters are -1 (DW_SIZE_AUTO) ... calculate the size */
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4962 if(width == DW_SIZE_AUTO \|\| height == DW_SIZE_AUTO)
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4963 _dw_control_size(object, width == DW_SIZE_AUTO ? &tmpitem[index].width : NULL, height == DW_SIZE_AUTO ? &tmpitem[index].height : NULL);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4964
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4965 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967 /* Update the item count */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 thisbox->count++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4969
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4970 /* Add the item to the box */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971 [view addSubview:this];
2817 5000a8a43825 iOS: Fix some memory leaks and remove unnecessary code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2813 diff changeset	4972 [this release];
5000a8a43825 iOS: Fix some memory leaks and remove unnecessary code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2813 diff changeset	4973
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4974 /* If we are packing a button... */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4975 if([this isMemberOfClass:[DWButton class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4976 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4977 DWButton button = (DWButton )this;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4978
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 /* Save the parent box so radio
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980 * buttons can use it later.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 [button setParent:view];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4985 _dw_redraw([view window], TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4986
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4987 /* Free the old data */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4988 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4989 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4990 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4991
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4992 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4993 * Remove windows (widgets) from the box they are packed into.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4994 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4995 * handle: Window handle of the packed item to be removed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4996 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4997 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4999 DW_FUNCTION_DEFINITION(dw_box_unpack, int, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5001 DW_FUNCTION_RETURN(dw_box_unpack, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5002 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5003 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5004 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5005 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5006 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5007 int retval = DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5008
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5009 if([object isKindOfClass:[UIView class]] \|\| [object isKindOfClass:[UIControl class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5010 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5011 DWBox parent = (DWBox )[object superview];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5012
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5013 if([parent isKindOfClass:[DWBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5015 id window = [object window];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5017 int z, index = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5018 Item tmpitem = NULL, thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5019
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020 if(!thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5021 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023 for(z=0;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 if(thisitem[z].hwnd == object)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 index = z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5028
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5029 if(index == -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5030 retval = DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5031 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5032 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5033 [object retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5034 [object removeFromSuperview];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5035
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5036 if(thisbox->count > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5037 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5038 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5039
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5040 /* Copy all but the current entry to the new list */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5041 for(z=0;z<index;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5042 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5043 tmpitem[z] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 for(z=index+1;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5046 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 tmpitem[z-1] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5049 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5050
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5051 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5052 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5053 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054 if(tmpitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055 thisbox->count--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5056 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5057 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5058 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5059 _dw_redraw(window, TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5060 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5061 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5062 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 * Remove windows (widgets) from a box at an arbitrary location.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 * box: Window handle of the box to be removed from.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071 * index: 0 based index of packed items.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5073 * Handle to the removed item on success, 0 on failure or padding.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5075 DW_FUNCTION_DEFINITION(dw_box_unpack_at_index, HWND, HWND box, int index)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5076 DW_FUNCTION_ADD_PARAM2(box, index)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5077 DW_FUNCTION_RETURN(dw_box_unpack_at_index, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078 DW_FUNCTION_RESTORE_PARAM2(box, HWND, index, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5080 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5081 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5082 DWBox parent = (DWBox )box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5083 id object = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5084
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5085 if([parent isKindOfClass:[DWBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5087 id window = [parent window];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5088 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5089
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5090 if(thisbox && index > -1 && index < thisbox->count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5091 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5092 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5093 Item tmpitem = NULL, thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5094
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5095 object = thisitem[index].hwnd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097 if(object)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 [object retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100 [object removeFromSuperview];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5101 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5102
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5103 if(thisbox->count > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5104 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5105 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5106
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5107 /* Copy all but the current entry to the new list */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5108 for(z=0;thisitem && z<index;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5109 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5110 tmpitem[z] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5111 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 for(z=index+1;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5113 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5114 tmpitem[z-1] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5115 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5117
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5120 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 if(tmpitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 thisbox->count--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5123 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5124 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5125
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5126 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 _dw_redraw(window, TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5128 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5129 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5130 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5131 DW_FUNCTION_RETURN_THIS(object);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5132 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5133
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5134 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5135 * Pack windows (widgets) into a box at an arbitrary location.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5136 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5137 * box: Window handle of the box to be packed into.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5138 * item: Window handle of the item to pack.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5139 * index: 0 based index of packed items.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5140 * width: Width in pixels of the item or -1 to be self determined.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5141 * height: Height in pixels of the item or -1 to be self determined.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5142 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5143 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5144 * pad: Number of pixels of padding around the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5145 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5146 DW_FUNCTION_DEFINITION(dw_box_pack_at_index, void, HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5147 DW_FUNCTION_ADD_PARAM8(box, item, index, width, height, hsize, vsize, pad)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5148 DW_FUNCTION_NO_RETURN(dw_box_pack_at_index)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5149 DW_FUNCTION_RESTORE_PARAM8(box, HWND, item, HWND, index, int, width, int, height, int, hsize, int, vsize, int, pad, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151 _dw_box_pack(box, item, index, width, height, hsize, vsize, pad, "dw_box_pack_at_index()");
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5152 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 * Pack windows (widgets) into a box from the start (or top).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5157 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5158 * box: Window handle of the box to be packed into.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5159 * item: Window handle of the item to pack.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 * width: Width in pixels of the item or -1 to be self determined.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5161 * height: Height in pixels of the item or -1 to be self determined.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5163 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5164 * pad: Number of pixels of padding around the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5165 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5166 DW_FUNCTION_DEFINITION(dw_box_pack_start, void, HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5167 DW_FUNCTION_ADD_PARAM7(box, item, width, height, hsize, vsize, pad)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5168 DW_FUNCTION_NO_RETURN(dw_box_pack_start)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5169 DW_FUNCTION_RESTORE_PARAM7(box, HWND, item, HWND, width, int, height, int, hsize, int, vsize, int, pad, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5170 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5171 /* 65536 is the table limit on GTK...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5172 * seems like a high enough value we will never hit it here either.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5173 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5174 _dw_box_pack(box, item, 65536, width, height, hsize, vsize, pad, "dw_box_pack_start()");
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5175 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5176 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5177
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5178 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5179 * Pack windows (widgets) into a box from the end (or bottom).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5180 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5181 * box: Window handle of the box to be packed into.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5182 * item: Window handle of the item to pack.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5183 * width: Width in pixels of the item or -1 to be self determined.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5184 * height: Height in pixels of the item or -1 to be self determined.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5185 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5186 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5187 * pad: Number of pixels of padding around the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5189 DW_FUNCTION_DEFINITION(dw_box_pack_end, void, HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5190 DW_FUNCTION_ADD_PARAM7(box, item, width, height, hsize, vsize, pad)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5191 DW_FUNCTION_NO_RETURN(dw_box_pack_end)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5192 DW_FUNCTION_RESTORE_PARAM7(box, HWND, item, HWND, width, int, height, int, hsize, int, vsize, int, pad, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5193 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194 _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5195 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5196 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5197
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5198 /* Internal function to create a basic button, used by all button types */
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5199 HWND _dw_internal_button_new(const char *text, ULONG cid, UIButtonType type)
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5200 {
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5201 DWButton *button = [[DWButton buttonWithType:type] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5202 if(text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5204 [button setTitle:[NSString stringWithUTF8String:text] forState:UIControlStateNormal];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5205 }
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5206 [button addTarget:button
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5207 action:@selector(buttonClicked:)
2401 010ae32a5067 iOS: Hide the UITransitionView that is attached to the UIWindow. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2400 diff changeset	5208 forControlEvents:UIControlEventTouchUpInside];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5209 [button setTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5210 if(DWDefaultFont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5211 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5212 [[button titleLabel] setFont:DWDefaultFont];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5213 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5214 return button;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5215 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5216
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5217 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5218 * Create a new button window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5219 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5220 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5223 DW_FUNCTION_DEFINITION(dw_button_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5224 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5225 DW_FUNCTION_RETURN(dw_button_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5226 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5227 {
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5228 DWButton *button = _dw_internal_button_new(text, cid, UIButtonTypeSystem);
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5229 [button setContentHorizontalAlignment:UIControlContentHorizontalAlignmentCenter];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5230 DW_FUNCTION_RETURN_THIS(button);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5231 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5232
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234 * Create a new Entryfield window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5235 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5236 * text: The default text to be in the entryfield widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5237 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5238 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5239 DW_FUNCTION_DEFINITION(dw_entryfield_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5240 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5241 DW_FUNCTION_RETURN(dw_entryfield_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5242 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5243 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	5244 DWEntryField *entry = [[[DWEntryField alloc] init] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5245 [entry setText:[ NSString stringWithUTF8String:text ]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5246 [entry setTag:cid];
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5247 [entry setDelegate:entry];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5248 DW_FUNCTION_RETURN_THIS(entry);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5249 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5250
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5251 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5252 * Create a new Entryfield (password) window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5253 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5254 * text: The default text to be in the entryfield widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5255 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5256 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5257 DW_FUNCTION_DEFINITION(dw_entryfield_password_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5258 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5259 DW_FUNCTION_RETURN(dw_entryfield_password_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5260 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261 {
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	5262 DWEntryField *entry = dw_entryfield_new(text, cid);
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	5263 [entry setSecureTextEntry:YES];
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5264 [entry setDelegate:entry];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5265 DW_FUNCTION_RETURN_THIS(entry);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5266 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5267
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5268 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5269 * Sets the entryfield character limit.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5270 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5271 * handle: Handle to the spinbutton to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5272 * limit: Number of characters the entryfield will take.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5273 */
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5274 DW_FUNCTION_DEFINITION(dw_entryfield_set_limit, void, HWND handle, unsigned long limit)
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5275 DW_FUNCTION_ADD_PARAM2(handle, limit)
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5276 DW_FUNCTION_NO_RETURN(dw_entryfield_set_limit)
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5277 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, limit, unsigned long)
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5278 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 DWEntryField *entry = handle;
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5280
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5281 [entry setMaximumLength:limit];
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5282 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5285 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5286 * Create a new bitmap button window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5287 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5288 * text: Bubble help text to be displayed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5289 * id: An ID of a bitmap in the resource file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5291 DW_FUNCTION_DEFINITION(dw_bitmapbutton_new, HWND, DW_UNUSED(const char *text), ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5292 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5293 DW_FUNCTION_RETURN(dw_bitmapbutton_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5294 DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(text), const char *, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296 NSBundle *bundle = [NSBundle mainBundle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 NSString *respath = [bundle resourcePath];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5298 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 UIImage *image = [[UIImage alloc] initWithContentsOfFile:filepath];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5300 DWButton *button = _dw_internal_button_new("", cid, UIButtonTypeCustom);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5301 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5302 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5303 [button setImage:image forState:UIControlStateNormal];
2649 76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5304 [image release];
76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5305 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5306 DW_FUNCTION_RETURN_THIS(button);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5307 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5308
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5309 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5310 * Create a new bitmap button window (widget) to be packed from a file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5311 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5312 * text: Bubble help text to be displayed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5313 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5314 * filename: Name of the file, omit extention to have
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315 * DW pick the appropriate file extension.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5316 * (BMP on OS/2 or Windows, XPM on Unix)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5317 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	5318 DW_FUNCTION_DEFINITION(dw_bitmapbutton_new_from_file, HWND, DW_UNUSED(const char text), ULONG cid, const char filename)
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5319 DW_FUNCTION_ADD_PARAM3(text, cid, filename)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5320 DW_FUNCTION_RETURN(dw_bitmapbutton_new_from_file, HWND)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	5321 DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(text), const char , cid, ULONG, filename, const char )
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5322 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5323 char *ext = _dw_get_image_extension(filename);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5324
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5325 NSString *nstr = [ NSString stringWithUTF8String:filename ];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5326 UIImage *image = [[UIImage alloc] initWithContentsOfFile:nstr];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328 if(!image && ext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5329 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5330 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5331 image = [[UIImage alloc] initWithContentsOfFile:nstr];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5332 }
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5333 DWButton *button = _dw_internal_button_new("", cid, UIButtonTypeCustom);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5334 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5335 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5336 [button setImage:image forState:UIControlStateNormal];
2649 76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5337 [image release];
76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5338 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5339 DW_FUNCTION_RETURN_THIS(button);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5340 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5341
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5343 * Create a new bitmap button window (widget) to be packed from data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5344 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5345 * text: Bubble help text to be displayed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5347 * data: The contents of the image
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5348 * (BMP or ICO on OS/2 or Windows, XPM on Unix)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5349 * len: length of str
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5350 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5351 DW_FUNCTION_DEFINITION(dw_bitmapbutton_new_from_data, HWND, DW_UNUSED(const char text), ULONG cid, const char data, int len)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5352 DW_FUNCTION_ADD_PARAM4(text, cid, data, len)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5353 DW_FUNCTION_RETURN(dw_bitmapbutton_new_from_data, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5354 DW_FUNCTION_RESTORE_PARAM4(DW_UNUSED(text), const char , cid, ULONG, data, const char , len, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5355 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5356 NSData *thisdata = [NSData dataWithBytes:data length:len];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5357 UIImage *image = [[UIImage alloc] initWithData:thisdata];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5358 DWButton *button = _dw_internal_button_new("", cid, UIButtonTypeCustom);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5359 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5360 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5361 [button setImage:image forState:UIControlStateNormal];
2649 76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5362 [image release];
76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5363 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5364 DW_FUNCTION_RETURN_THIS(button);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5365 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5366
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5367 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5368 * Create a new spinbutton window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5369 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5370 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5372 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5373 DW_FUNCTION_DEFINITION(dw_spinbutton_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5374 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5375 DW_FUNCTION_RETURN(dw_spinbutton_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5376 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5377 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	5378 DWSpinButton *spinbutton = [[[DWSpinButton alloc] init] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5379 UIStepper *stepper = [spinbutton stepper];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5380 UITextField *textfield = [spinbutton textfield];
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5381 long val = atol(text);
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5382
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5383 [stepper setStepValue:1];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5384 [stepper setTag:cid];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5385 [stepper setMinimumValue:-65536];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5386 [stepper setMaximumValue:65536];
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5387 [stepper setValue:(float)val];
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5388 [textfield setText:[NSString stringWithFormat:@"%ld",val]];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5389 DW_FUNCTION_RETURN_THIS(spinbutton);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5390 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5391
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5392 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5393 * Sets the spinbutton value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5394 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5395 * handle: Handle to the spinbutton to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5396 * position: Current value of the spinbutton.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5397 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5398 DW_FUNCTION_DEFINITION(dw_spinbutton_set_pos, void, HWND handle, long position)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5399 DW_FUNCTION_ADD_PARAM2(handle, position)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5400 DW_FUNCTION_NO_RETURN(dw_spinbutton_set_pos)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5401 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, long)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5402 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5403 DWSpinButton *spinbutton = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5404 UIStepper *stepper = [spinbutton stepper];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5405 UITextField *textfield = [spinbutton textfield];
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5406 [stepper setValue:(float)position];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5407 [textfield setText:[NSString stringWithFormat:@"%ld",position]];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5408 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5409 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5411 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5412 * Sets the spinbutton limits.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5413 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5414 * handle: Handle to the spinbutton to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5415 * upper: Upper limit.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5416 * lower: Lower limit.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5417 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5418 DW_FUNCTION_DEFINITION(dw_spinbutton_set_limits, void, HWND handle, long upper, long lower)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5419 DW_FUNCTION_ADD_PARAM3(handle, upper, lower)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5420 DW_FUNCTION_NO_RETURN(dw_spinbutton_set_limits)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5421 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, upper, long, lower, long)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5422 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5423 DWSpinButton *spinbutton = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424 UIStepper *stepper = [spinbutton stepper];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5425 [stepper setMinimumValue:(double)lower];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5426 [stepper setMaximumValue:(double)upper];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5427 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5429
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5431 * Returns the current value of the spinbutton.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5432 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5433 * handle: Handle to the spinbutton to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5434 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5435 DW_FUNCTION_DEFINITION(dw_spinbutton_get_pos, long, HWND handle)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5436 DW_FUNCTION_ADD_PARAM1(handle)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5437 DW_FUNCTION_RETURN(dw_spinbutton_get_pos, long)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5438 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5439 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5440 DWSpinButton *spinbutton = handle;
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5441 long retval;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442 UIStepper *stepper = [spinbutton stepper];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5443 retval = (long)[stepper value];
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5444 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5445 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5448 * Create a new radiobutton window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5450 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5451 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5452 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5453 DW_FUNCTION_DEFINITION(dw_radiobutton_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5454 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5455 DW_FUNCTION_RETURN(dw_radiobutton_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5456 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5457 {
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5458 DWButton *button = _dw_internal_button_new(text, cid, UIButtonTypeSystem);
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5459 [button setType:_DW_BUTTON_TYPE_RADIO];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5460 DW_FUNCTION_RETURN_THIS(button);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5461 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5462
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5463 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5464 * Create a new slider window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5465 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5466 * vertical: TRUE or FALSE if slider is vertical.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5467 * increments: Number of increments available.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5468 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5469 */
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5470 DW_FUNCTION_DEFINITION(dw_slider_new, HWND, int vertical, int increments, ULONG cid)
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5471 DW_FUNCTION_ADD_PARAM3(vertical, increments, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5472 DW_FUNCTION_RETURN(dw_slider_new, HWND)
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5473 DW_FUNCTION_RESTORE_PARAM3(vertical, int, increments, int, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	5475 DWSlider *slider = [[[DWSlider alloc] init] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5476 [slider setMaximumValue:(double)increments];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5477 [slider setMinimumValue:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5478 [slider setContinuous:YES];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	5479 [slider addTarget:slider
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	5480 action:@selector(sliderChanged:)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	5481 forControlEvents:UIControlEventValueChanged];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5482 [slider setTag:cid];
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5483 [slider setVertical:(vertical ? YES : NO)];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5484 DW_FUNCTION_RETURN_THIS(slider);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5485 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5486
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5487 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5488 * Returns the position of the slider.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5489 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5490 * handle: Handle to the slider to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5491 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5492 unsigned int API dw_slider_get_pos(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5493 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 DWSlider *slider = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5495 double val = [slider value];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496 return (int)val;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5500 * Sets the slider position.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5502 * handle: Handle to the slider to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 * position: Position of the slider withing the range.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5505 void API dw_slider_set_pos(HWND handle, unsigned int position)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5506 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507 DWSlider *slider = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5508 [slider setValue:(double)position];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5509 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5510
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5511 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5512 * Create a new scrollbar window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5513 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5514 * vertical: TRUE or FALSE if scrollbar is vertical.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5515 * increments: Number of increments available.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5516 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5517 */
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	5518 DW_FUNCTION_DEFINITION(dw_scrollbar_new, HWND, int vertical, ULONG cid)
27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	5519 DW_FUNCTION_ADD_PARAM2(vertical, cid)
27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	5520 DW_FUNCTION_RETURN(dw_scrollbar_new, HWND)
27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	5521 DW_FUNCTION_RESTORE_PARAM2(vertical, int, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5522 {
2718 2987bf90c7c9 iOS: Hide the UISlider track when using them as scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2712 diff changeset	5523 DWSlider *slider = dw_slider_new(vertical, 1, cid);
2987bf90c7c9 iOS: Hide the UISlider track when using them as scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2712 diff changeset	5524 [slider setMinimumTrackTintColor:[UIColor clearColor]];
2987bf90c7c9 iOS: Hide the UISlider track when using them as scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2712 diff changeset	5525 [slider setMaximumTrackTintColor:[UIColor clearColor]];
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	5526 DW_FUNCTION_RETURN_THIS(slider);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5527 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5528
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5529 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5530 * Returns the position of the scrollbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5531 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5532 * handle: Handle to the scrollbar to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5533 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5534 unsigned int API dw_scrollbar_get_pos(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5535 {
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5536 return dw_slider_get_pos(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5537 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5538
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5539 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5540 * Sets the scrollbar position.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5541 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542 * handle: Handle to the scrollbar to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 * position: Position of the scrollbar withing the range.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5544 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5545 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5546 {
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5547 dw_slider_set_pos(handle, position);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5548 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5549
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5551 * Sets the scrollbar range.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5553 * handle: Handle to the scrollbar to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 * range: Maximum range value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555 * visible: Visible area relative to the range.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558 {
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5559 DWSlider *slider = handle;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5560 [slider setMaximumValue:(double)range];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5561 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5562
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5563 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5564 * Create a new percent bar window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5565 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5566 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5567 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5568 DW_FUNCTION_DEFINITION(dw_percent_new, HWND, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5569 DW_FUNCTION_ADD_PARAM1(cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5570 DW_FUNCTION_RETURN(dw_percent_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5571 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5572 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	5573 DWPercent *percent = [[[DWPercent alloc] init] retain];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5574 [percent setTag:cid];
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5575 DW_FUNCTION_RETURN_THIS(percent);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5576 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5577
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5578 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579 * Sets the percent bar position.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5580 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581 * handle: Handle to the percent bar to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5582 * position: Position of the percent bar withing the range.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5584 DW_FUNCTION_DEFINITION(dw_percent_set_pos, void, HWND handle, unsigned int position)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5585 DW_FUNCTION_ADD_PARAM2(handle, position)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5586 DW_FUNCTION_NO_RETURN(dw_percent_set_pos)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5587 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, unsigned int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5588 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5589 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 DWPercent *percent = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5591
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 /* Handle indeterminate */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5593 if(position == DW_PERCENT_INDETERMINATE)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5594 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5595 [percent setProgress:0 animated:NO];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5596 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5597 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5599 /* Handle normal */
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5600 [percent setProgress:(float)position/100.0 animated:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5604
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5605 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5606 * Create a new checkbox window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5607 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5608 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5609 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5610 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5611 DW_FUNCTION_DEFINITION(dw_checkbox_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5612 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5613 DW_FUNCTION_RETURN(dw_checkbox_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5614 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5615 {
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5616 DWButton *button = _dw_internal_button_new(text, cid, UIButtonTypeSystem);
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5617 [button setType:_DW_BUTTON_TYPE_CHECK];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	5618 DW_FUNCTION_RETURN_THIS(button);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5619 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5620
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5621 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 * Returns the state of the checkbox.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5624 * handle: Handle to the checkbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625 */
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5626 DW_FUNCTION_DEFINITION(dw_checkbox_get, int, HWND handle)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5627 DW_FUNCTION_ADD_PARAM1(handle)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5628 DW_FUNCTION_RETURN(dw_checkbox_get, int)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5629 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 DWButton *button = handle;
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5632 int retval = FALSE;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5633
2700 246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	5634 if([button checkState])
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5635 retval = TRUE;
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5636 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5637 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5638
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5639 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5640 * Sets the state of the checkbox.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5641 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 * handle: Handle to the checkbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5643 * value: TRUE for checked, FALSE for unchecked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5644 */
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5645 DW_FUNCTION_DEFINITION(dw_checkbox_set, void, HWND handle, int value)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5646 DW_FUNCTION_ADD_PARAM2(handle, value)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5647 DW_FUNCTION_NO_RETURN(dw_checkbox_set)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5648 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, value, int)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5649 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5650 DWButton *button = handle;
2680 1888d0a08365 iOS: Move the check/radio type alignment changes into setType: method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2679 diff changeset	5651 [button setCheckState:value];
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5652 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5654
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 /* Internal common function to create containers and listboxes */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 HWND _dw_cont_new(ULONG cid, int multi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	5658 DWContainer *cont = [[[DWContainer alloc] init] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5660 [cont setAllowsMultipleSelection:(multi ? YES : NO)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5661 [cont setDataSource:cont];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5662 [cont setDelegate:cont];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5663 [cont setTag:cid];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	5664 [cont setRowHeight:UITableViewAutomaticDimension];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	5665 [cont setEstimatedRowHeight:(_dw_container_mode > DW_CONTAINER_MODE_DEFAULT ? 85.0 : 44.0)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5666 [cont setRowBgOdd:DW_RGB_TRANSPARENT andEven:DW_RGB_TRANSPARENT];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5667 return cont;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5668 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5669
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5670 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671 * Create a new listbox window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5672 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5674 * multi: Multiple select TRUE or FALSE.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5675 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5676 DW_FUNCTION_DEFINITION(dw_listbox_new, HWND, ULONG cid, int multi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5677 DW_FUNCTION_ADD_PARAM2(cid, multi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5678 DW_FUNCTION_RETURN(dw_listbox_new, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5679 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5680 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 DWContainer *cont = _dw_cont_new(cid, multi);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 [cont setup];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	5684 [cont addColumn:@"" andType:DW_CFA_STRING];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5685 DW_FUNCTION_RETURN_THIS(cont);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5686 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5688 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5689 * Appends the specified text to the listbox's (or combobox) entry list.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5690 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5691 * handle: Handle to the listbox to be appended to.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5692 * text: Text to append into listbox.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5693 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5694 DW_FUNCTION_DEFINITION(dw_listbox_append, void, HWND handle, const char *text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5695 DW_FUNCTION_ADD_PARAM2(handle, text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5696 DW_FUNCTION_NO_RETURN(dw_listbox_append)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5697 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5698 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5699 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5700 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5701
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5702 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5703 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5704 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5705
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5706 [combo append:[NSString stringWithUTF8String:text]];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5707 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5708 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5709 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 NSString *nstr = [NSString stringWithUTF8String:text];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5712
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5713 [cont addRow:_dw_table_cell_view_new(nil, nstr, nil)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5715 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5716 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5717 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5718 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5719
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5720 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 * Inserts the specified text into the listbox's (or combobox) entry list.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5723 * handle: Handle to the listbox to be inserted into.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5724 * text: Text to insert into listbox.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5725 * pos: 0-based position to insert text
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 DW_FUNCTION_DEFINITION(dw_listbox_insert, void, HWND handle, const char *text, int pos)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 DW_FUNCTION_ADD_PARAM3(handle, text, pos)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5729 DW_FUNCTION_NO_RETURN(dw_listbox_insert)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5730 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, const char *, pos, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5731 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5732 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5733 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5734
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5735 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5736 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5737 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5738
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5739 [combo insert:[NSString stringWithUTF8String:text] atIndex:pos];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5740 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5741 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5742 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5743 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5744 NSString *nstr = [NSString stringWithUTF8String:text];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5745
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5746 [cont insertRow:_dw_table_cell_view_new(nil, nstr, nil) at:pos];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5747 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5748 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5749 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5750 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5752
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5753 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5754 * Appends the specified text items to the listbox's (or combobox) entry list.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5755 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5756 * handle: Handle to the listbox to be appended to.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5757 * text: Text strings to append into listbox.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5758 * count: Number of text strings to append
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5759 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5760 DW_FUNCTION_DEFINITION(dw_listbox_list_append, void, HWND handle, char **text, int count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5761 DW_FUNCTION_ADD_PARAM3(handle, text, count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5762 DW_FUNCTION_NO_RETURN(dw_listbox_list_append)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5763 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, char **, count, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5764 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5765 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5768 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5769 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5770 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5771 int z;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5772
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5773 for(z=0;z<count;z++)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5774 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5775 NSString *nstr = [NSString stringWithUTF8String:text[z]];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5776
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5777 [combo append:nstr];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5778 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5779 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5780 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5781 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5782 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5783 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5784
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5785 for(z=0;z<count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5786 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5787 NSString *nstr = [NSString stringWithUTF8String:text[z]];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5788
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5789 [cont addRow:_dw_table_cell_view_new(nil, nstr, nil)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5790 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5792 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5795 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5796
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5797 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 * Clears the listbox's (or combobox) list of all entries.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5799 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 * handle: Handle to the listbox to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5801 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802 DW_FUNCTION_DEFINITION(dw_listbox_clear, void, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5803 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5804 DW_FUNCTION_NO_RETURN(dw_listbox_clear)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5805 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5806 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5807 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5808 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5809
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5810 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5811 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5812 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5813
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5814 [combo clear];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5815 }
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5816 if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5817 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5818 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5819
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5820 [cont clear];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5821 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5822 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5823 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5824 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5825 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5826
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5827 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5828 * Returns the listbox's item count.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830 * handle: Handle to the listbox to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 DW_FUNCTION_DEFINITION(dw_listbox_count, int, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5833 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 DW_FUNCTION_RETURN(dw_listbox_count, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5836 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5837 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5838 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5839 int result = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5840
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5841 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5842 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5843 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5844
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5845 result = [combo count];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5846 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5847 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5848 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5849 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	5850 result = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5851 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5852 DW_FUNCTION_RETURN_THIS(result);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5853 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5854
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5855 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5856 * Sets the topmost item in the viewport.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5857 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5858 * handle: Handle to the listbox to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5859 * top: Index to the top item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5860 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5861 DW_FUNCTION_DEFINITION(dw_listbox_set_top, void, HWND handle, int top)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5862 DW_FUNCTION_ADD_PARAM2(handle, top)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5863 DW_FUNCTION_NO_RETURN(dw_listbox_set_top)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5864 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, top, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5865 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5866 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5868
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5869 if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5870 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5871 DWContainer *cont = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5872 NSIndexPath *myIP = [NSIndexPath indexPathForRow:top inSection:0];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5873
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5874 [cont scrollToRowAtIndexPath:myIP atScrollPosition:UITableViewScrollPositionNone animated:NO];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5875 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5876 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5877 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5878
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5879 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5880 * Copies the given index item's text into buffer.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5881 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 * handle: Handle to the listbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5883 * index: Index into the list to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5884 * buffer: Buffer where text will be copied.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5885 * length: Length of the buffer (including NULL).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5886 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5887 DW_FUNCTION_DEFINITION(dw_listbox_get_text, void, HWND handle, unsigned int index, char *buffer, unsigned int length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5888 DW_FUNCTION_ADD_PARAM4(handle, index, buffer, length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5889 DW_FUNCTION_NO_RETURN(dw_listbox_get_text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5890 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, index, unsigned int, buffer, char *, length, unsigned int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5891 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5892 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5893 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5894
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5895 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5896 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5897 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5898 NSString *nstr = [combo getTextAtIndex:index];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5899
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5900 if(nstr)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5901 strncpy(buffer, [nstr UTF8String], length - 1);
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5902 else
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5903 *buffer = '\0';
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5904 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5905 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5906 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5907 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	5908 int count = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5909
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5910 if(index > count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5911 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5912 *buffer = '\0';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5913 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5914 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5915 {
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5916 DWTableViewCell *cell = [cont getRow:index];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	5917 NSString *nstr = [[cell label] text];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5918
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5919 strncpy(buffer, [nstr UTF8String], length - 1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5920 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5921 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5923 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5924
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5925 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5926 * Sets the text of a given listbox entry.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5927 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 * handle: Handle to the listbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 * index: Index into the list to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 * buffer: Buffer where text will be copied.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5931 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5932 DW_FUNCTION_DEFINITION(dw_listbox_set_text, void, HWND handle, unsigned int index, const char *buffer)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 DW_FUNCTION_ADD_PARAM3(handle, index, buffer)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 DW_FUNCTION_NO_RETURN(dw_listbox_set_text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5935 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, unsigned int, buffer, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5936 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5938 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5939
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5940 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5941 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5942 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5943
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5944 [combo setText:[NSString stringWithUTF8String:buffer] atIndex:index];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5945 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5946 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5948 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	5949 int count = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5950
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5951 if(index <= count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5952 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5953 NSString *nstr = [NSString stringWithUTF8String:buffer];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5954 DWTableViewCell *cell = [cont getRow:index];
2417 ccfc4ee9c4a7 iOS: Missed a few other DWContainer fixes in that last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2416 diff changeset	5955
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	5956 [[cell label] setText:nstr];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5957 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5958 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5959 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5960 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5961 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5962 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5963
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5964 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5965 * Returns the index to the item in the list currently selected.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5966 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5967 * handle: Handle to the listbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5968 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5969 DW_FUNCTION_DEFINITION(dw_listbox_selected, int, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5970 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5971 DW_FUNCTION_RETURN(dw_listbox_selected, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5972 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5973 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5974 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5976 int result = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5977
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5978 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5979 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5980 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5981
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5982 result = [combo selectedIndex];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5983 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5984 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5985 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 DWContainer *cont = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5987 NSIndexPath *ip = [cont indexPathForSelectedRow];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5988
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5989 if(ip)
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5990 result = (int)ip.row;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5991 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5992 DW_FUNCTION_RETURN_THIS(result);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5993 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5994
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5995 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5996 * Returns the index to the current selected item or -1 when done.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5997 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5998 * handle: Handle to the listbox to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5999 * where: Either the previous return or -1 to restart.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6000 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6001 DW_FUNCTION_DEFINITION(dw_listbox_selected_multi, int, HWND handle, int where)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6002 DW_FUNCTION_ADD_PARAM2(handle, where)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6003 DW_FUNCTION_RETURN(dw_listbox_selected_multi, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6004 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, where, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6005 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6006 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6007 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6008 int retval = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6009
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6010 if([object isMemberOfClass:[DWContainer class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012 DWContainer *cont = handle;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	6013 NSArray *selected = [cont indexPathsForSelectedRows];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6014 NSIndexPath *ip = [selected objectAtIndex:(where == -1 ? 0 :where)];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6015
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6016 if(ip)
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6017 retval = (int)ip.row;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 DW_FUNCTION_RETURN_THIS(retval)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6020 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6021
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6022 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6023 * Sets the selection state of a given index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6024 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6025 * handle: Handle to the listbox to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6026 * index: Item index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6027 * state: TRUE if selected FALSE if unselected.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6028 */
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6029 DW_FUNCTION_DEFINITION(dw_listbox_select, void, HWND handle, int index, DW_UNUSED(int state))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6030 DW_FUNCTION_ADD_PARAM3(handle, index, state)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6031 DW_FUNCTION_NO_RETURN(dw_listbox_select)
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6032 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, int, DW_UNUSED(state), int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6033 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6034 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6035 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6036
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6037 if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6039 DWContainer *cont = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6040 NSIndexPath *ip = [NSIndexPath indexPathForRow:index inSection:0];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6041
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6042 [cont selectRowAtIndexPath:ip
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6043 animated:NO
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6044 scrollPosition:UITableViewScrollPositionNone];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 }
2804 deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6046 else if([object isMemberOfClass:[DWComboBox class]])
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6047 {
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6048 DWComboBox *combo = handle;
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6049 [combo selectIndex:index];
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6050 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6051 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6052 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6053
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6054 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6055 * Deletes the item with given index from the list.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6056 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6057 * handle: Handle to the listbox to be set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6058 * index: Item index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6059 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6060 DW_FUNCTION_DEFINITION(dw_listbox_delete, void, HWND handle, int index)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6061 DW_FUNCTION_ADD_PARAM2(handle, index)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 DW_FUNCTION_NO_RETURN(dw_listbox_delete)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6063 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, index, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6064 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6065 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6066 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6067
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6068 if([object isMemberOfClass:[DWComboBox class]])
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6069 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6070 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6071
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6072 [combo deleteAtIndex:index];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6073 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6074 else if([object isMemberOfClass:[DWContainer class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6075 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6077
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6078 [cont removeRow:index];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6079 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	6080 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6081 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6082 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6083 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6084
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6085 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6086 * Create a new Combobox window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6087 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6088 * text: The default text to be in the combpbox widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090 */
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6091 DW_FUNCTION_DEFINITION(dw_combobox_new, HWND, const char *text, ULONG cid)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6092 DW_FUNCTION_ADD_PARAM2(text, cid)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6093 DW_FUNCTION_RETURN(dw_combobox_new, HWND)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6094 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6095 {
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	6096 DWComboBox *combo = [[[DWComboBox alloc] init] retain];
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6097 if(text)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6098 [combo setText:[NSString stringWithUTF8String:text]];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6099 [combo setTag:cid];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6100 DW_FUNCTION_RETURN_THIS(combo);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6101 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6102
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6103 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 * Create a new Multiline Editbox window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6106 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6107 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6108 DW_FUNCTION_DEFINITION(dw_mle_new, HWND, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6109 DW_FUNCTION_ADD_PARAM1(cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6110 DW_FUNCTION_RETURN(dw_mle_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6111 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6112 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	6113 CGRect frame = CGRectMake(0, 0, 100, 50);
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	6114 NSTextContainer *tc = [[NSTextContainer alloc] initWithSize:frame.size];
2421 d88928a85436 iOS: Fix DWMLE, have to created it like this to have valid textStorage. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2420 diff changeset	6115 NSLayoutManager *lm = [[NSLayoutManager alloc] init];
d88928a85436 iOS: Fix DWMLE, have to created it like this to have valid textStorage. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2420 diff changeset	6116 NSTextStorage *ts = [[NSTextStorage alloc] init];
d88928a85436 iOS: Fix DWMLE, have to created it like this to have valid textStorage. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2420 diff changeset	6117 [lm addTextContainer:tc];
d88928a85436 iOS: Fix DWMLE, have to created it like this to have valid textStorage. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2420 diff changeset	6118 [ts addLayoutManager:lm];
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	6119 DWMLE *mle = [[[DWMLE alloc] initWithFrame:frame textContainer:tc] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6120 CGSize size = [mle intrinsicContentSize];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6121
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6122 size.width = size.height;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6123 [mle setAutoresizingMask:UIViewAutoresizingFlexibleHeight\|UIViewAutoresizingFlexibleWidth];
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6124 [mle setScrollEnabled:YES];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6125 [mle setTag:cid];
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6126 DW_FUNCTION_RETURN_THIS(mle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6127 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6128
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6129 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6130 * Adds text to an MLE box and returns the current point.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6131 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6132 * handle: Handle to the MLE to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 * buffer: Text buffer to be imported.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6134 * startpoint: Point to start entering text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6135 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6136 DW_FUNCTION_DEFINITION(dw_mle_import, unsigned int, HWND handle, const char *buffer, int startpoint)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6137 DW_FUNCTION_ADD_PARAM3(handle, buffer, startpoint)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6138 DW_FUNCTION_RETURN(dw_mle_import, unsigned int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6139 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, buffer, const char *, startpoint, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6140 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6141 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6142 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6143 unsigned int retval;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6144 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6145 NSString *nstr = [NSString stringWithUTF8String:buffer];
2444 ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6146 UIColor *fgcolor = [mle textColor];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6147 UIFont *font = [mle font];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6148 NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6149 [attributes setObject:(fgcolor ? fgcolor : [UIColor labelColor]) forKey:NSForegroundColorAttributeName];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6150 if(font)
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6151 [attributes setObject:font forKey:NSFontAttributeName];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6152 NSAttributedString *nastr = [[NSAttributedString alloc] initWithString:nstr attributes:attributes];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6153 NSUInteger length = [ts length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6154 if(startpoint < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6155 startpoint = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 if(startpoint > length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6157 startpoint = (int)length;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6158 [ts insertAttributedString:nastr atIndex:startpoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6159 retval = (unsigned int)strlen(buffer) + startpoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6160 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6161 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6162
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6163 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6164 * Grabs text from an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6165 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6166 * handle: Handle to the MLE to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6167 * buffer: Text buffer to be exported.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6168 * startpoint: Point to start grabbing text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6169 * length: Amount of text to be grabbed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6170 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6171 DW_FUNCTION_DEFINITION(dw_mle_export, void, HWND handle, char *buffer, int startpoint, int length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6172 DW_FUNCTION_ADD_PARAM4(handle, buffer, startpoint, length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6173 DW_FUNCTION_NO_RETURN(dw_mle_export)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6174 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, buffer, char *, startpoint, int, length, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6175 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6176 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6177 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6178 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6179 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6180 const char *tmp = [ms UTF8String];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6181 strncpy(buffer, tmp+startpoint, length);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182 buffer[length] = '\0';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6183 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6184 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6185
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6186 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6187 * Obtains information about an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6188 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6189 * handle: Handle to the MLE to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6190 * bytes: A pointer to a variable to return the total bytes.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191 * lines: A pointer to a variable to return the number of lines.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6193 DW_FUNCTION_DEFINITION(dw_mle_get_size, void, HWND handle, unsigned long bytes, unsigned long lines)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194 DW_FUNCTION_ADD_PARAM3(handle, bytes, lines)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6195 DW_FUNCTION_NO_RETURN(dw_mle_get_size)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6196 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, bytes, unsigned long , lines, unsigned long )
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6197 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6198 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6199 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6200 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6201 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6202 NSUInteger numberOfLines, index, stringLength = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6203
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6204 if(bytes)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6205 *bytes = stringLength;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6206 if(lines)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6207 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6208 for(index=0, numberOfLines=0; index < stringLength; numberOfLines++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6209 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6210
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6211 *lines = numberOfLines;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6212 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6213 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6214 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6216 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6217 * Deletes text from an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6218 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6219 * handle: Handle to the MLE to be deleted from.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6220 * startpoint: Point to start deleting text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6221 * length: Amount of text to be deleted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6223 DW_FUNCTION_DEFINITION(dw_mle_delete, void, HWND handle, int startpoint, int length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6224 DW_FUNCTION_ADD_PARAM3(handle, startpoint, length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6225 DW_FUNCTION_NO_RETURN(dw_mle_delete)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6226 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, startpoint, int, length, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6227 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6228 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6229 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6230 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6231 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6232 NSUInteger mslength = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6233 if(startpoint < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6234 startpoint = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6235 if(startpoint > mslength)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6236 startpoint = (int)mslength;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6237 if(startpoint + length > mslength)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6238 length = (int)mslength - startpoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6239 [ms deleteCharactersInRange:NSMakeRange(startpoint, length)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6241 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6242
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6243 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244 * Clears all text from an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6245 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 * handle: Handle to the MLE to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6247 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 DW_FUNCTION_DEFINITION(dw_mle_clear, void, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6249 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6250 DW_FUNCTION_NO_RETURN(dw_mle_clear)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6251 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6252 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6253 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6256 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6257 NSUInteger length = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6258 [ms deleteCharactersInRange:NSMakeRange(0, length)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6260 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6262 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6263 * Sets the visible line of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6264 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6265 * handle: Handle to the MLE to be positioned.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6266 * line: Line to be visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6267 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6268 DW_FUNCTION_DEFINITION(dw_mle_set_visible, void, HWND handle, int line)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6269 DW_FUNCTION_ADD_PARAM2(handle, line)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6270 DW_FUNCTION_NO_RETURN(dw_mle_set_visible)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, line, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6272 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6273 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6274 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6275 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6276 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6277 NSUInteger numberOfLines, index, stringLength = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6278
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6279 for(index=0, numberOfLines=0; index < stringLength && numberOfLines < line; numberOfLines++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6280 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6281
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6282 if(line == numberOfLines)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6283 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6284 [mle scrollRangeToVisible:[ms lineRangeForRange:NSMakeRange(index, 0)]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6285 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6286 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6287 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6288
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6289 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6290 * Sets the editablity of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6291 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6292 * handle: Handle to the MLE.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293 * state: TRUE if it can be edited, FALSE for readonly.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6294 */
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6295 DW_FUNCTION_DEFINITION(dw_mle_set_editable, void, HWND handle, int state)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6296 DW_FUNCTION_ADD_PARAM2(handle, state)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6297 DW_FUNCTION_NO_RETURN(dw_mle_set_editable)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6298 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, state, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6299 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6300 DWMLE *mle = handle;
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6301 [mle setEditable:(state ? YES : NO)];
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6302 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6303 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6304
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6305 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6306 * Sets the word wrap state of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6307 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6308 * handle: Handle to the MLE.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6309 * state: TRUE if it wraps, FALSE if it doesn't.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6310 */
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6311 DW_FUNCTION_DEFINITION(dw_mle_set_word_wrap, void, HWND handle, int state)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6312 DW_FUNCTION_ADD_PARAM2(handle, state)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6313 DW_FUNCTION_NO_RETURN(dw_mle_set_word_wrap)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6314 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, state, int)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6315 {
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6316 DWMLE *mle = handle;
2700 246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6317
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6318 [[mle textContainer] setLineBreakMode:(state ? NSLineBreakByWordWrapping : NSLineBreakByClipping)];
2700 246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6319 [[mle textContainer] setWidthTracksTextView:(state ? YES : NO)];
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6320 if(!state)
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6321 [[mle textContainer] setSize:CGRectInfinite.size];
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6322 else
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6323 {
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6324 CGSize size = [mle frame].size;
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6325 [[mle textContainer] setSize:CGSizeMake(size.width, CGRectInfinite.size.height)];
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6326 }
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6327 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6328 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6329
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6330 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6331 * Sets the word auto complete state of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6332 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6333 * handle: Handle to the MLE.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6334 * state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6335 */
2699 0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6336 DW_FUNCTION_DEFINITION(dw_mle_set_auto_complete, void, HWND handle, int state)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6337 DW_FUNCTION_ADD_PARAM2(handle, state)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6338 DW_FUNCTION_NO_RETURN(dw_mle_set_auto_complete)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6339 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, state, int)
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6340 {
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6341 DWMLE *mle = handle;
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6342 NSInteger autocorrect = (state & DW_MLE_COMPLETE_TEXT) ? UITextAutocorrectionTypeYes : UITextAutocorrectionTypeNo;
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6343 [mle setAutocorrectionType:autocorrect];
0d5e99279c8b iOS: MLE work: Implement dw_mle_set_auto_complete() DW_MLE_COMPLETE_TEXT now bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2698 diff changeset	6344 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6345 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6346
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6347 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6348 * Sets the current cursor position of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6349 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6350 * handle: Handle to the MLE to be positioned.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6351 * point: Point to position cursor.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6352 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6353 DW_FUNCTION_DEFINITION(dw_mle_set_cursor, void, HWND handle, int point)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6354 DW_FUNCTION_ADD_PARAM2(handle, point)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6355 DW_FUNCTION_NO_RETURN(dw_mle_set_cursor)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6356 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, point, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6357 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6358 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6359 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6360 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6361 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6362 NSUInteger length = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6363 if(point < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6364 point = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6365 if(point > length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6366 point = (int)length;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6367 [mle setSelectedRange: NSMakeRange(point,point)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6368 [mle scrollRangeToVisible:NSMakeRange(point,point)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6371
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6373 * Finds text in an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6374 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6375 * handle: Handle to the MLE to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6376 * text: Text to search for.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6377 * point: Start point of search.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6378 * flags: Search specific flags.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6379 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 DW_FUNCTION_DEFINITION(dw_mle_search, int, HWND handle, const char *text, int point, unsigned long flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6381 DW_FUNCTION_ADD_PARAM4(handle, text, point, flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382 DW_FUNCTION_RETURN(dw_mle_search, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, text, const char *, point, int, flags, unsigned long)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6384 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6385 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6386 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6387 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6388 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6389 NSString *searchForMe = [NSString stringWithUTF8String:text];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6390 NSRange searchRange = NSMakeRange(point, [ms length] - point);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6391 NSRange range = NSMakeRange(NSNotFound, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6392 NSUInteger options = flags ? flags : NSCaseInsensitiveSearch;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6393 int retval = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6394
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6395 if(ms)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6396 range = [ms rangeOfString:searchForMe options:options range:searchRange];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6397 if(range.location == NSNotFound)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6398 retval = (int)range.location;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6400 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6401
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6402 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6403 * Stops redrawing of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6404 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6405 * handle: Handle to the MLE to freeze.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6406 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6407 void API dw_mle_freeze(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6408 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6409 /* Don't think this is necessary */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6410 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6411
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6412 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6413 * Resumes redrawing of an MLE box.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6414 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6415 * handle: Handle to the MLE to thaw.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6416 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6417 void API dw_mle_thaw(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6418 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6419 /* Don't think this is necessary */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6420 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6421
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6422 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6423 * Create a new status text window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6425 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6426 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6427 */
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6428 DW_FUNCTION_DEFINITION(dw_status_text_new, HWND, const char *text, ULONG cid)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6429 DW_FUNCTION_ADD_PARAM2(text, cid)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6430 DW_FUNCTION_RETURN(dw_status_text_new, HWND)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6431 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6432 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6433 DWText *textfield = [[[DWText alloc] init] retain];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6434 [textfield setText:[NSString stringWithUTF8String:text]];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6435 [textfield setTag:cid];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6436 if(DWDefaultFont)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6437 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6438 [textfield setFont:DWDefaultFont];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6439 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6440 [textfield layer].borderWidth = 2.0;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6441 [textfield layer].borderColor = [[UIColor darkGrayColor] CGColor];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6442 DW_FUNCTION_RETURN_THIS(textfield);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6443 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6444
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6445 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6446 * Create a new static text window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6447 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6448 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6449 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6450 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6451 DW_FUNCTION_DEFINITION(dw_text_new, HWND, const char *text, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6452 DW_FUNCTION_ADD_PARAM2(text, cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6453 DW_FUNCTION_RETURN(dw_text_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6454 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6455 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	6456 DWText *textfield = [[[DWText alloc] init] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6457 [textfield setText:[NSString stringWithUTF8String:text]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6458 [textfield setTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6459 if(DWDefaultFont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6460 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6461 [textfield setFont:DWDefaultFont];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6462 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6463 DW_FUNCTION_RETURN_THIS(textfield);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6464 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6465
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6466 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6467 * Creates a rendering context widget (window) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6468 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6469 * id: An id to be used with dw_window_from_id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6470 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6471 * A handle to the widget or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6472 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6473 DW_FUNCTION_DEFINITION(dw_render_new, HWND, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6474 DW_FUNCTION_ADD_PARAM1(cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6475 DW_FUNCTION_RETURN(dw_render_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6476 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6477 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	6478 DWRender *render = [[[DWRender alloc] init] retain];
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	6479 UIContextMenuInteraction *interaction = [[UIContextMenuInteraction alloc] initWithDelegate:render];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 [render setTag:cid];
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	6481 [render addInteraction:interaction];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	6482 DW_FUNCTION_RETURN_THIS(render);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6483 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6484
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6485 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6486 * Invalidate the render widget triggering an expose event.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6487 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6488 * handle: A handle to a render widget to be redrawn.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6489 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6490 DW_FUNCTION_DEFINITION(dw_render_redraw, void, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6491 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6492 DW_FUNCTION_NO_RETURN(dw_render_redraw)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6493 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6494 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6495 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6496 DWRender render = (DWRender )handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6497
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	6498 [render setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6499 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6500 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6501
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502 /* Sets the current foreground drawing color.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6504 * red: red value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 * green: green value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6506 * blue: blue value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6507 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6508 void API dw_color_foreground_set(unsigned long value)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6509 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6510 UIColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6511 UIColor *newcolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6512 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6513
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6514 _dw_foreground = _dw_get_color(value);
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6515
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6516 newcolor = [[UIColor colorWithRed: DW_RED_VALUE(_dw_foreground)/255.0 green:
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6517 DW_GREEN_VALUE(_dw_foreground)/255.0 blue:
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6518 DW_BLUE_VALUE(_dw_foreground)/255.0 alpha: 1] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6519 pthread_setspecific(_dw_fg_color_key, newcolor);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6520 [oldcolor release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6522 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6523
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6524 /* Sets the current background drawing color.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6525 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6526 * red: red value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6527 * green: green value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6528 * blue: blue value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6529 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6530 void API dw_color_background_set(unsigned long value)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6531 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6532 UIColor *oldcolor = pthread_getspecific(_dw_bg_color_key);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6533 UIColor *newcolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6534 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6535
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6536 if(value == DW_CLR_DEFAULT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6537 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6538 pthread_setspecific(_dw_bg_color_key, NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6539 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6540 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6541 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6542 _dw_background = _dw_get_color(value);
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6543
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6544 newcolor = [[UIColor colorWithRed: DW_RED_VALUE(_dw_background)/255.0 green:
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6545 DW_GREEN_VALUE(_dw_background)/255.0 blue:
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6546 DW_BLUE_VALUE(_dw_background)/255.0 alpha: 1] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6547 pthread_setspecific(_dw_bg_color_key, newcolor);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6548 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6549 [oldcolor release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6550 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6551 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6552
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6553 /* Allows the user to choose a color using the system's color chooser dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6554 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6555 * value: current color
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6556 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6557 * The selected color or the current color if cancelled.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6558 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6559 unsigned long API dw_color_choose(unsigned long value)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6560 {
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	6561 NSMutableArray *params = [NSMutableArray arrayWithObject:[NSNumber numberWithUnsignedLong:_dw_get_color(value)]];
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6562 unsigned long newcolor = value;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6563
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6564 [DWObj safeCall:@selector(colorPicker:) withObject:params];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6565 if([params count] > 1)
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6566 newcolor = [[params lastObject] unsignedLongValue];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6567
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6568 return newcolor;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6569 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6570
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6571 CGContextRef _dw_draw_context(id source, bool antialiased)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6572 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6573 CGContextRef context = nil;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6574
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6575 if([source isMemberOfClass:[DWImage class]])
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6576 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6577 DWImage *image = source;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6578
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6579 context = [image cgcontext];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6580 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6581 if(context)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6582 CGContextSetAllowsAntialiasing(context, antialiased);
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6583 return context;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6584 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6585
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6586 DWImage *_dw_dest_image(HPIXMAP pixmap, id object)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6587 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6588 if(pixmap && pixmap->image)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6589 return pixmap->image;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6590 if([object isMemberOfClass:[DWRender class]])
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6591 return [object cachedImage];
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6592 return nil;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6593 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6594
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6595 /* Draw a point on a window (preferably a render window).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6597 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6598 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6599 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6600 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6601 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6602 DW_FUNCTION_DEFINITION(dw_draw_point, void, HWND handle, HPIXMAP pixmap, int x, int y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6603 DW_FUNCTION_ADD_PARAM4(handle, pixmap, x, y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6604 DW_FUNCTION_NO_RETURN(dw_draw_point)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6605 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, pixmap, HPIXMAP, x, int, y, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6606 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6607 DW_FUNCTION_INIT;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6608 DWImage *bi = _dw_dest_image(pixmap, handle);
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6609 CGContextRef context = _dw_draw_context(bi, NO);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6610
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6611 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6612 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6613
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6614 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6615 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6616 UIBezierPath* aPath = [UIBezierPath bezierPath];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6617 [aPath setLineWidth: 0.5];
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6618 [_dw_fg_color set];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6619
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6620 [aPath moveToPoint:CGPointMake(x, y)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6621 [aPath stroke];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6622 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6623 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6624 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6627
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6628 /* Draw a line on a window (preferably a render window).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6630 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6631 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6632 * x1: First X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6633 * y1: First Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6634 * x2: Second X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6635 * y2: Second Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637 DW_FUNCTION_DEFINITION(dw_draw_line, void, HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6638 DW_FUNCTION_ADD_PARAM6(handle, pixmap, x1, y1, x2, y2)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6639 DW_FUNCTION_NO_RETURN(dw_draw_line)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6640 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, pixmap, HPIXMAP, x1, int, y1, int, x2, int, y2, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642 DW_FUNCTION_INIT;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6643 DWImage *bi = _dw_dest_image(pixmap, handle);
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6644 CGContextRef context = _dw_draw_context(bi, NO);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6645
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6646 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6647 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6648
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6649 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6650 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6651 UIBezierPath* aPath = [UIBezierPath bezierPath];
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6652 [_dw_fg_color set];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6653
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6654 [aPath moveToPoint:CGPointMake(x1 + 0.5, y1 + 0.5)];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	6655 [aPath addLineToPoint:CGPointMake(x2 + 0.5, y2 + 0.5)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6656 [aPath stroke];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6657 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6658 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6659 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6660 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6661 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6662
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6663 /* Draw text on a window (preferably a render window).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6664 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6665 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6666 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6667 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6668 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6669 * text: Text to be displayed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6670 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6671 DW_FUNCTION_DEFINITION(dw_draw_text, void, HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6672 DW_FUNCTION_ADD_PARAM5(handle, pixmap, x, y, text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6673 DW_FUNCTION_NO_RETURN(dw_draw_text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6674 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, x, int, y, int, text, const char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6675 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 NSString *nstr = [ NSString stringWithUTF8String:text ];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6678 DWImage *bi = nil;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6679 UIFont *font = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6680 DWRender *render;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6681 id image = handle;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6682
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6683 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6684 {
2395 2618277de356 iOS: Code error cleanup reported by LLVM. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2393 diff changeset	6685 bi = (id)pixmap->image;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6686 font = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6687 render = pixmap->handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6688 if(!font && [render isMemberOfClass:[DWRender class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6689 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6690 font = [render font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6691 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6692 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6693 else if(image && [image isMemberOfClass:[DWRender class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6694 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6695 render = image;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6696 font = [render font];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6697 bi = [render cachedImage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6698 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6699 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6700 {
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6701 CGContextRef context = _dw_draw_context(bi, NO);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6702
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6703 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6704 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6705
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6706 NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:_dw_fg_color, NSForegroundColorAttributeName, nil];
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6707 if(_dw_bg_color)
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6708 [dict setValue:_dw_bg_color forKey:NSBackgroundColorAttributeName];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6709 if(font)
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6710 [dict setValue:font forKey:NSFontAttributeName];
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6711 [nstr drawAtPoint:CGPointMake(x, y) withAttributes:dict];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6712 [dict release];
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6713 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6714 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6715 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6716 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6717 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6718
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6719 /* Query the width and height of a text string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6720 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6721 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6722 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6723 * text: Text to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6724 * width: Pointer to a variable to be filled in with the width.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6725 * height Pointer to a variable to be filled in with the height.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6726 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6727 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, const char text, int width, int *height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6728 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6729 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6730 NSString *nstr;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6731 UIFont *font = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6732 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6733
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6734 nstr = [NSString stringWithUTF8String:text];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6735
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6736 /* Check the pixmap for associated object or font */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6737 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6738 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6739 object = pixmap->handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6740 font = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6741 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6742 NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6743 /* If we didn't get a font from the pixmap... try the associated object */
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	6744 if(!font && ([object isMemberOfClass:[DWRender class]] \|\| [object isKindOfClass:[UIControl class]]
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	6745 \|\| [object isKindOfClass:[UILabel class]]))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6746 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6747 font = [object font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6748 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6749 /* If we got a font... add it to the dictionary */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6750 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6751 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6752 [dict setValue:font forKey:NSFontAttributeName];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6753 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6754 /* Calculate the size of the string */
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	6755 CGSize size = [nstr sizeWithAttributes:dict];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6756 [dict release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6757 /* Return whatever information we can */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6758 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6759 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6760 *width = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6761 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6762 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6763 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6764 *height = size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6765 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6766 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6767 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6768
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6769 /* Draw a polygon on a window (preferably a render window).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6770 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6771 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6772 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6773 * flags: DW_DRAW_FILL (1) to fill the polygon or DW_DRAW_DEFAULT (0).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6774 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6775 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6776 * width: Width of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6777 * height: Height of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6778 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6779 DW_FUNCTION_DEFINITION(dw_draw_polygon, void, HWND handle, HPIXMAP pixmap, int flags, int npoints, int x, int y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780 DW_FUNCTION_ADD_PARAM6(handle, pixmap, flags, npoints, x, y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6781 DW_FUNCTION_NO_RETURN(dw_draw_polygon)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, pixmap, HPIXMAP, flags, int, npoints, int, x, int , y, int )
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6783 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 DW_FUNCTION_INIT;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6785 DWImage *bi = _dw_dest_image(pixmap, handle);
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6786 CGContextRef context = _dw_draw_context(bi, flags & DW_DRAW_NOAA ? NO : YES);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6787
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6788 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6789 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6790
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6791 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6792 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6793 UIBezierPath* aPath = [UIBezierPath bezierPath];
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6794 int z;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6795
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6796 [_dw_fg_color set];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6797
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6798 [aPath moveToPoint:CGPointMake(x + 0.5, y + 0.5)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6799 for(z=1;z<npoints;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6800 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6801 [aPath addLineToPoint:CGPointMake(x[z] + 0.5, y[z] + 0.5)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6802 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6803 [aPath closePath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6804 if(flags & DW_DRAW_FILL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6805 [aPath fill];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6806 else
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6807 [aPath stroke];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6808 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6809 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6810 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6811 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6812 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6813
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6814 /* Draw a rectangle on a window (preferably a render window).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6815 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6816 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6817 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6818 * flags: DW_DRAW_FILL (1) to fill the box or DW_DRAW_DEFAULT (0).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6819 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6820 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6821 * width: Width of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6822 * height: Height of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6823 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6824 DW_FUNCTION_DEFINITION(dw_draw_rect, void, HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6825 DW_FUNCTION_ADD_PARAM7(handle, pixmap, flags, x, y, width, height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6826 DW_FUNCTION_NO_RETURN(dw_draw_rect)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6827 DW_FUNCTION_RESTORE_PARAM7(handle, HWND, pixmap, HPIXMAP, flags, int, x, int, y, int, width, int, height, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6828 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6829 DW_FUNCTION_INIT;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6830 DWImage *bi = _dw_dest_image(pixmap, handle);
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6831 CGContextRef context = _dw_draw_context(bi, flags & DW_DRAW_NOAA ? NO : YES);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6832
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6833 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6834 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6835
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6836 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6837 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6838 UIBezierPath *bp = [UIBezierPath bezierPathWithRect:CGRectMake(x, y, width, height)];;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6839
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6840 [_dw_fg_color set];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6841
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6842 if(flags & DW_DRAW_FILL)
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6843 [bp fill];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6844 else
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6845 [bp stroke];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6846 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6847 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6848 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6849 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6850 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6851
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6852 /* Draw an arc on a window (preferably a render window).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6853 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6854 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6855 * pixmap: Handle to the pixmap. (choose only one of these)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6856 * flags: DW_DRAW_FILL (1) to fill the arc or DW_DRAW_DEFAULT (0).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6857 * DW_DRAW_FULL will draw a complete circle/elipse.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6858 * xorigin: X coordinate of center of arc.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6859 * yorigin: Y coordinate of center of arc.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6860 * x1: X coordinate of first segment of arc.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6861 * y1: Y coordinate of first segment of arc.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6862 * x2: X coordinate of second segment of arc.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6863 * y2: Y coordinate of second segment of arc.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6864 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6865 DW_FUNCTION_DEFINITION(dw_draw_arc, void, HWND handle, HPIXMAP pixmap, int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6866 DW_FUNCTION_ADD_PARAM9(handle, pixmap, flags, xorigin, yorigin, x1, y1, x2, y2)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6867 DW_FUNCTION_NO_RETURN(dw_draw_arc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6868 DW_FUNCTION_RESTORE_PARAM9(handle, HWND, pixmap, HPIXMAP, flags, int, xorigin, int, yorigin, int, x1, int, y1, int, x2, int, y2, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6869 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6870 DW_FUNCTION_INIT;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6871 DWImage *bi = _dw_dest_image(pixmap, handle);
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6872 CGContextRef context = _dw_draw_context(bi, flags & DW_DRAW_NOAA ? NO : YES);
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6873
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6874 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6875 UIGraphicsPushContext(context);
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6876
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6877 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6878 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6879 UIBezierPath* aPath;
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6880
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6881 [_dw_fg_color set];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6882
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6883 /* Special case of a full circle/oval */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6884 if(flags & DW_DRAW_FULL)
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6885 aPath = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(x1, y1, x2 - x1, y2 - y1)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6887 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6888 double a1 = atan2((y1-yorigin), (x1-xorigin));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6889 double a2 = atan2((y2-yorigin), (x2-xorigin));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6890 double dx = xorigin - x1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6891 double dy = yorigin - y1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6892 double r = sqrt(dxdx + dydy);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6893
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6894 /* Prepare to draw */
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6895 aPath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(xorigin, yorigin)
2440 070337dd4ef7 iOS: Fix dw_draw_arc()... iOS is in raidans not degrees. Thanks wiliz on freenode. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2438 diff changeset	6896 radius:r startAngle:a1 endAngle:a2 clockwise:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6897 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6898 /* If the fill flag is passed */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6899 if(flags & DW_DRAW_FILL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6900 [aPath fill];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6901 else
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6902 [aPath stroke];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6903 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6904 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6905 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6906 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6907 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6908
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6909 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6910 * Create a tree object to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6911 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6912 * id: An ID to be used for getting the resource from the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6913 * resource file.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6914 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6915 * A handle to a tree window or NULL on failure.
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6916 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6917 DW_FUNCTION_DEFINITION(dw_tree_new, HWND, ULONG cid)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6918 DW_FUNCTION_ADD_PARAM1(cid)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6919 DW_FUNCTION_RETURN(dw_tree_new, HWND)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6920 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6921 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6922 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6923 DWTree *tree = [[[DWTree alloc] init] retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6924 [tree setTag:cid];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6925 DW_FUNCTION_RETURN_THIS(tree);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6926 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6927
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6928 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6929 * Inserts an item into a tree window (widget) after another item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6930 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6931 * handle: Handle to the tree to be inserted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6932 * item: Handle to the item to be positioned after.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6933 * title: The text title of the entry.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6934 * icon: Handle to coresponding icon.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6935 * parent: Parent handle or 0 if root.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6936 * itemdata: Item specific data.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6937 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6938 * A handle to a tree item or NULL on failure.
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6939 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6940 DW_FUNCTION_DEFINITION(dw_tree_insert_after, HTREEITEM, HWND handle, HTREEITEM item, const char title, HICN icon, HTREEITEM parent, void itemdata)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6941 DW_FUNCTION_ADD_PARAM6(handle, item, title, icon, parent, itemdata)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6942 DW_FUNCTION_RETURN(dw_tree_insert_after, HTREEITEM)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6943 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, item, HTREEITEM, title, char , icon, HICN, parent, HTREEITEM, itemdata, void )
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6944 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6945 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6946 DWTree *tree = handle;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6947 DWTreeItem *treeparent = item ? item : parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6948 DWTreeItem *treeitem = [[[DWTreeItem alloc] initWithIcon:icon
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6949 Title:[NSString stringWithUTF8String:(title ? title : "")]
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6950 andData:itemdata] retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6951 if(treeparent)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6952 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6953 if(item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6954 [treeparent insertChildAfter:treeitem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6955 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6956 [treeparent appendChild:treeitem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6957 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6958 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6959 [tree insertTreeItem:treeitem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6960 DW_FUNCTION_RETURN_THIS(treeitem);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6961 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6962
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6963 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6964 * Inserts an item into a tree window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6965 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6966 * handle: Handle to the tree to be inserted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6967 * title: The text title of the entry.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6968 * icon: Handle to coresponding icon.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6969 * parent: Parent handle or 0 if root.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6970 * itemdata: Item specific data.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6971 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6972 * A handle to a tree item or NULL on failure.
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6973 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6974 HTREEITEM API dw_tree_insert(HWND handle, const char title, HICN icon, HTREEITEM parent, void itemdata)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6975 {
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6976 return dw_tree_insert_after(handle, NULL, title, icon, parent, itemdata);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6977 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6978
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6979 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6980 * Gets the text an item in a tree window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6981 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6982 * handle: Handle to the tree containing the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6983 * item: Handle of the item to be modified.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6984 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6985 * A malloc()ed buffer of item text to be dw_free()ed or NULL on error.
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6986 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6987 DW_FUNCTION_DEFINITION(dw_tree_get_title, char *, HWND handle, HTREEITEM item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6988 DW_FUNCTION_ADD_PARAM2(handle, item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6989 DW_FUNCTION_RETURN(dw_tree_get_title, char *)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6990 DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6991 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6992 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6993 char *title = NULL;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6994 DWTreeItem *treeitem = item;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6995 if(treeitem)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6996 title = strdup([treeitem.title UTF8String]);
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6997 DW_FUNCTION_RETURN_THIS(title);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6998 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6999
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7000 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7001 * Gets the text an item in a tree window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7002 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7003 * handle: Handle to the tree containing the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7004 * item: Handle of the item to be modified.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7005 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7006 * A handle to a tree item or NULL on failure.
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7007 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7008 DW_FUNCTION_DEFINITION(dw_tree_get_parent, HTREEITEM, HWND handle, HTREEITEM item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7009 DW_FUNCTION_ADD_PARAM2(handle, item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7010 DW_FUNCTION_RETURN(dw_tree_get_parent, HTREEITEM)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7011 DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7012 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7013 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7014 DWTreeItem *treeparent = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7015 DWTreeItem *treeitem = item;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7016 if(treeitem)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7017 treeparent = treeitem.parent;
2769 06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7018 if(treeparent && [treeparent isRoot])
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7019 treeparent = NULL;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7020 DW_FUNCTION_RETURN_THIS(treeparent);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7021 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7022
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7023 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7024 * Sets the text and icon of an item in a tree window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7025 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7026 * handle: Handle to the tree containing the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7027 * item: Handle of the item to be modified.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7028 * title: The text title of the entry.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7029 * icon: Handle to coresponding icon.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7030 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7031 DW_FUNCTION_DEFINITION(dw_tree_item_change, void, HWND handle, HTREEITEM item, const char *title, HICN icon)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7032 DW_FUNCTION_ADD_PARAM4(handle, item, title, icon)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7033 DW_FUNCTION_NO_RETURN(dw_tree_item_change)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7034 DW_FUNCTION_RESTORE_PARAM4(DW_UNUSED(handle), HWND, item, HTREEITEM, title, const char *, icon, HICN)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7035 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7036 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7037 DWTreeItem *treeitem = item;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7038 if(handle && treeitem)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7039 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7040 [treeitem setIcon:icon];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7041 [treeitem setTitle:[NSString stringWithUTF8String:(title ? title : "")]];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7042 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7043 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7044 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7045
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7046 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7047 * Sets the item data of a tree item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7048 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7049 * handle: Handle to the tree containing the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7050 * item: Handle of the item to be modified.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7051 * itemdata: User defined data to be associated with item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7052 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7053 DW_FUNCTION_DEFINITION(dw_tree_item_set_data, void, HWND handle, HTREEITEM item, void *itemdata)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7054 DW_FUNCTION_ADD_PARAM3(handle, item, itemdata)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7055 DW_FUNCTION_NO_RETURN(dw_tree_item_set_data)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7056 DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(handle), HWND, item, HTREEITEM, itemdata, void *)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7057 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7058 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7059 DWTreeItem *treeitem = item;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7060 if(handle && treeitem)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7061 [treeitem setData:itemdata];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7062 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7063 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7064
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7065 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7066 * Gets the item data of a tree item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7067 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7068 * handle: Handle to the tree containing the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7069 * item: Handle of the item to be modified.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7070 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7071 * A pointer to tree item data or NULL on failure.
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7072 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7073 DW_FUNCTION_DEFINITION(dw_tree_item_get_data, void *, HWND handle, HTREEITEM item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7074 DW_FUNCTION_ADD_PARAM2(handle, item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7075 DW_FUNCTION_RETURN(dw_tree_item_get_data, void *)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7076 DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7077 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7078 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7079 void *result = NULL;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7080 DWTreeItem *treeitem = item;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7081 if(handle && treeitem)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7082 result = [treeitem data];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7083 DW_FUNCTION_RETURN_THIS(result);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7084 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7085
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7086 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7087 * Sets this item as the active selection.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7088 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7089 * handle: Handle to the tree window (widget) to be selected.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7090 * item: Handle to the item to be selected.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7091 */
2769 06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7092 DW_FUNCTION_DEFINITION(dw_tree_item_select, void, HWND handle, HTREEITEM item)
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7093 DW_FUNCTION_ADD_PARAM2(handle, item)
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7094 DW_FUNCTION_NO_RETURN(dw_tree_item_select)
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7095 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7096 {
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7097 DW_FUNCTION_INIT;
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7098 DWTree *tree = handle;
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7099 DWTreeItem *treeitem = item;
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7100
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7101 if(tree && treeitem)
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7102 {
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7103 NSInteger itemIndex = [tree treeView:tree rowForTreeItem:treeitem];
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7104 if(itemIndex > -1)
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7105 {
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7106 NSIndexPath *ip = [NSIndexPath indexPathForRow:(NSUInteger)itemIndex inSection:0];
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7107
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7108 [tree selectRowAtIndexPath:ip
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7109 animated:NO
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7110 scrollPosition:UITableViewScrollPositionNone];
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7111 }
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7112 }
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7113 DW_FUNCTION_RETURN_NOTHING;
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7114 }
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7115
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7116
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7117 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7118 * Removes all nodes from a tree.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7119 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7120 * handle: Handle to the window (widget) to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7121 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7122 DW_FUNCTION_DEFINITION(dw_tree_clear, void, HWND handle)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7123 DW_FUNCTION_ADD_PARAM1(handle)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7124 DW_FUNCTION_NO_RETURN(dw_tree_clear)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7125 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7126 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7127 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7128 DWTree *tree = handle;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7129 [tree clear];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7130 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7131 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7132
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7133 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7134 * Expands a node on a tree.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7135 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136 * handle: Handle to the tree window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7137 * item: Handle to node to be expanded.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7138 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7139 DW_FUNCTION_DEFINITION(dw_tree_item_expand, void, HWND handle, HTREEITEM item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7140 DW_FUNCTION_ADD_PARAM2(handle, item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7141 DW_FUNCTION_NO_RETURN(dw_tree_item_expand)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7142 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7143 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7144 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7145 DWTree *tree = handle;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7146 DWTreeItem *treeitem = item;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7147 if(![treeitem expanded])
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7148 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7149 [treeitem setExpanded:YES];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7150 [tree reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7151 [tree resetSelection:NO];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7152 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7153 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7155
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7156 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7157 * Collapses a node on a tree.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7158 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7159 * handle: Handle to the tree window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7160 * item: Handle to node to be collapsed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7161 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7162 DW_FUNCTION_DEFINITION(dw_tree_item_collapse, void, HWND handle, HTREEITEM item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7163 DW_FUNCTION_ADD_PARAM2(handle, item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7164 DW_FUNCTION_NO_RETURN(dw_tree_item_collapse)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7165 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7166 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7167 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7168 DWTree *tree = handle;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7169 DWTreeItem *treeitem = item;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7170 if([treeitem expanded])
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7171 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7172 [treeitem setExpanded:NO];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7173 [tree reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7174 [tree resetSelection:NO];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7175 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7176 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7177 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7178
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7179 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7180 * Removes a node from a tree.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7181 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7182 * handle: Handle to the window (widget) to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 * item: Handle to node to be deleted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7184 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7185 DW_FUNCTION_DEFINITION(dw_tree_item_delete, void, HWND handle, HTREEITEM item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7186 DW_FUNCTION_ADD_PARAM2(handle, item)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7187 DW_FUNCTION_NO_RETURN(dw_tree_item_delete)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7188 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7189 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7190 DW_FUNCTION_INIT;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7191 DWTree *tree = handle;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7192 DWTreeItem *treeitem = item;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7193 [treeitem removeFromParent];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7194 [tree reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7195 [tree resetSelection:NO];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7196 DW_FUNCTION_RETURN_NOTHING;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7197 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7198
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7199
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7200 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7201 * Create a container object to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7202 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7203 * id: An ID to be used for getting the resource from the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7204 * resource file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7205 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7206 DW_FUNCTION_DEFINITION(dw_container_new, HWND, ULONG cid, int multi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7207 DW_FUNCTION_ADD_PARAM2(cid, multi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7208 DW_FUNCTION_RETURN(dw_container_new, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7209 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7210 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7211 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 DWContainer *cont = _dw_cont_new(cid, multi);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7213 DW_FUNCTION_RETURN_THIS(cont);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7215
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7216 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7217 * Sets up the container columns.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7218 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7219 * handle: Handle to the container to be configured.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7220 * flags: An array of unsigned longs with column flags.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7221 * titles: An array of strings with column text titles.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7222 * count: The number of columns (this should match the arrays).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7223 * separator: The column number that contains the main separator.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7224 * (this item may only be used in OS/2)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7225 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7226 DW_FUNCTION_DEFINITION(dw_container_setup, int, HWND handle, unsigned long flags, char *titles, int count, int separator)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7227 DW_FUNCTION_ADD_PARAM5(handle, flags, titles, count, separator)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7228 DW_FUNCTION_RETURN(dw_container_setup, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7229 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, flags, unsigned long , titles, char *, count, int, DW_UNUSED(separator), int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7230 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7231 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7232 int z, retval = DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7233 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7234
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7235 [cont setup];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7236
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237 for(z=0;z<count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7238 {
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7239 /* Even though we don't have columns on iOS, we save the data...
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7240 * So we can simulate columns when displaying the data in the list.
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7241 */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7242 NSString *title = [NSString stringWithUTF8String:titles[z]];
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7243
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7244 [cont addColumn:title andType:(int)flags[z]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7245 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7246 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7247 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7248
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7249 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7250 * Configures the main filesystem columnn title for localization.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7251 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7252 * handle: Handle to the container to be configured.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7253 * title: The title to be displayed in the main column.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7254 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7255 void API dw_filesystem_set_column_title(HWND handle, const char *title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7256 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7257 char *newtitle = strdup(title ? title : "");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7258
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7259 dw_window_set_data(handle, "_dw_coltitle", newtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7260 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7261
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7262 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7263 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7264 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7265 * handle: Handle to the container to be configured.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7266 * flags: An array of unsigned longs with column flags.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7267 * titles: An array of strings with column text titles.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7268 * count: The number of columns (this should match the arrays).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7269 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 int API dw_filesystem_setup(HWND handle, unsigned long flags, char *titles, int count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7271 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272 char *newtitles = malloc(sizeof(char ) * (count + 1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7273 unsigned long newflags = malloc(sizeof(unsigned long) (count + 1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7274 char coltitle = (char )dw_window_get_data(handle, "_dw_coltitle");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7275 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7276
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7277 newtitles[0] = coltitle ? coltitle : "Filename";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7278
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7279 newflags[0] = DW_CFA_STRINGANDICON \| DW_CFA_LEFT \| DW_CFA_HORZSEPARATOR;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7280
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7281 memcpy(&newtitles[1], titles, sizeof(char ) count);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7282 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7283
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7284 dw_container_setup(handle, newflags, newtitles, count + 1, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7285 [cont setFilesystem:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7286
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7287 if(coltitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7288 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7289 dw_window_set_data(handle, "_dw_coltitle", NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7290 free(coltitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7291 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7292 free(newtitles);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7293 free(newflags);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7294 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7295 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7296
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7297 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7298 * Allocates memory used to populate a container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7299 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7300 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7301 * rowcount: The number of items to be populated.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7302 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7303 DW_FUNCTION_DEFINITION(dw_container_alloc, void *, HWND handle, int rowcount)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7304 DW_FUNCTION_ADD_PARAM2(handle, rowcount)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7305 DW_FUNCTION_RETURN(dw_container_alloc, void *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7306 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, rowcount, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7307 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7309 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7310 [cont addRows:rowcount];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311 DW_FUNCTION_RETURN_THIS(cont);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7312 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7313
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7314 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 * Sets an item in specified row and column to the given data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7316 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7317 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7318 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319 * column: Zero based column of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7321 * data: Pointer to the data to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7323 DW_FUNCTION_DEFINITION(dw_container_set_item, void, HWND handle, void pointer, int column, int row, void data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7324 DW_FUNCTION_ADD_PARAM5(handle, pointer, column, row, data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7325 DW_FUNCTION_NO_RETURN(dw_container_set_item)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7326 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , column, int, row, int, data, void )
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7327 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7328 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7329 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7330 id icon = nil, text = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7331 int type = [cont cellType:column];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7332 int lastadd = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7333
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334 /* If pointer is NULL we are getting a change request instead of set */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335 if(pointer)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336 lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7337
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7339 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 if(type & DW_CFA_BITMAPORICON)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7341 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7342 icon = ((UIImage *)data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7343 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7344 else if(type & DW_CFA_STRING)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7346 char str = ((char **)data);
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7347 text = [NSString stringWithUTF8String:str];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7348 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7349 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7350 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7351 char textbuffer[101] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7352
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353 if(type & DW_CFA_ULONG)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7355 ULONG tmp = ((ULONG )data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7356
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357 snprintf(textbuffer, 100, "%lu", tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7358 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7359 else if(type & DW_CFA_DATE)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7360 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7361 struct tm curtm;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 CDATE cdate = ((CDATE )data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7364 memset(&curtm, 0, sizeof(curtm));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7365 curtm.tm_mday = cdate.day;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7366 curtm.tm_mon = cdate.month - 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7367 curtm.tm_year = cdate.year - 1900;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7369 strftime(textbuffer, 100, "%x", &curtm);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7370 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7371 else if(type & DW_CFA_TIME)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7372 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 struct tm curtm;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7374 CTIME ctime = ((CTIME )data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7375
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7376 memset( &curtm, 0, sizeof(curtm) );
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7377 curtm.tm_hour = ctime.hours;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7378 curtm.tm_min = ctime.minutes;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7379 curtm.tm_sec = ctime.seconds;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7380
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7381 strftime(textbuffer, 100, "%X", &curtm);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7383 if(textbuffer[0])
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7384 text = [NSString stringWithUTF8String:textbuffer];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7385 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7386 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7387
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7388 id object = [cont getRow:(row+lastadd)];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7389 NSUInteger capacity = [[cont getColumns] count];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7390
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7391 /* If it is a cell, change the content of the cell */
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7392 if([object isMemberOfClass:[DWTableViewCell class]])
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7393 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7394 DWTableViewCell *cell = object;
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7395
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7396 if(column == 0)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7397 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7398 if(icon)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	7399 [[cell image] setImage:icon];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7400 else
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	7401 [[cell label] setText:text];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7402 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7403 else if(icon \|\| text)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7404 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7405 NSMutableArray *cd = [cell columnData];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7406
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7407 if(column >= capacity)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7408 capacity = column + 1;
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7409
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7410 if(!cd)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7411 cd = [NSMutableArray arrayWithCapacity:capacity];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7412 if(cd)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7413 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7414 while([cd count] <= column)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7415 [cd addObject:[NSNull null]];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7416 [cd replaceObjectAtIndex:column withObject:(text ? text : icon)];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7417 }
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	7418 [cell setColumnData:cd];
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7419 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7420 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7421 else
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7422 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7423 NSMutableArray *cd = [NSMutableArray arrayWithCapacity:(capacity > column ? capacity : column + 1)];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7424 if(cd)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7425 [cd replaceObjectAtIndex:column withObject:(text ? text : icon)];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7426 /* Otherwise replace it with a new cell */
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7427 [cont editCell:_dw_table_cell_view_new(icon, text, cd) at:(row+lastadd)];
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7428 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	7429 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7430 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7431 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7432
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7433 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7434 * Changes an existing item in specified row and column to the given data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7435 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7436 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7437 * column: Zero based column of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7438 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7439 * data: Pointer to the data to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7440 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7441 void API dw_container_change_item(HWND handle, int column, int row, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7442 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7443 dw_container_set_item(handle, NULL, column, row, data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7444 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7445
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7446 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7447 * Changes an existing item in specified row and column to the given data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7448 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7449 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7450 * column: Zero based column of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7451 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 * data: Pointer to the data to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7455 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7456 dw_container_change_item(handle, column+1, row, data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7457 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7458
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7459 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460 * Changes an item in specified row and column to the given data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7462 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7464 * column: Zero based column of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 * data: Pointer to the data to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7468 void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7469 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7470 dw_filesystem_set_file(handle, NULL, row, filename, icon);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7471 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7472
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7473 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7474 * Sets an item in specified row and column to the given data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7475 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7476 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7477 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7478 * column: Zero based column of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7480 * data: Pointer to the data to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7481 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7482 DW_FUNCTION_DEFINITION(dw_filesystem_set_file, void, HWND handle, void pointer, int row, const char filename, HICN icon)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7483 DW_FUNCTION_ADD_PARAM5(handle, pointer, row, filename, icon)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7484 DW_FUNCTION_NO_RETURN(dw_filesystem_set_file)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7485 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , row, int, filename, char , icon, HICN)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7486 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7487 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7488 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7489 NSString *text = filename ? [NSString stringWithUTF8String:filename] : nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7490 int lastadd = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7491
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 /* If pointer is NULL we are getting a change request instead of set */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7493 if(pointer)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7494 lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7495
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7496 id object = [cont getRow:(row+lastadd)];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7497
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7498 /* If it is a cell, change the content of the cell */
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7499 if([object isMemberOfClass:[DWTableViewCell class]])
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7500 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7501 DWTableViewCell *cell = object;
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7502
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7503 if(icon)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	7504 [[cell image] setImage:icon];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7505 if(text)
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	7506 [[cell label] setText:text];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7507 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7508 else /* Otherwise replace it with a new cell */
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7509 [cont editCell:_dw_table_cell_view_new(icon, text, nil) at:(row+lastadd)];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	7510 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7511 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7512 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7513
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7515 * Sets an item in specified row and column to the given data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7516 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7517 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7518 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7519 * column: Zero based column of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7520 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7521 * data: Pointer to the data to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7522 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 void API dw_filesystem_set_item(HWND handle, void pointer, int column, int row, void data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7524 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525 dw_container_set_item(handle, pointer, column+1, row, data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7527
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7528 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7529 * Gets column type for a container column
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7530 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7531 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7532 * column: Zero based column.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7533 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7534 DW_FUNCTION_DEFINITION(dw_container_get_column_type, int, HWND handle, int column)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7535 DW_FUNCTION_ADD_PARAM2(handle, column)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536 DW_FUNCTION_RETURN(dw_container_get_column_type, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7537 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, column, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7538 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7539 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7541 int rc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7542 int flag = [cont cellType:column];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7543 if(flag & DW_CFA_BITMAPORICON)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7544 rc = DW_CFA_BITMAPORICON;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7545 else if(flag & DW_CFA_STRING)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7546 rc = DW_CFA_STRING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7547 else if(flag & DW_CFA_ULONG)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7548 rc = DW_CFA_ULONG;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7549 else if(flag & DW_CFA_DATE)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7550 rc = DW_CFA_DATE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7551 else if(flag & DW_CFA_TIME)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7552 rc = DW_CFA_TIME;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7553 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7554 rc = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7555 DW_FUNCTION_RETURN_THIS(rc);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7557
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7558 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7559 * Gets column type for a filesystem container column
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7560 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7561 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562 * column: Zero based column.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7563 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 int API dw_filesystem_get_column_type(HWND handle, int column)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7565 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 return dw_container_get_column_type(handle, column+1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7567 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7568
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7569 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7570 * Sets the alternating row colors for container window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7571 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572 * handle: The window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7573 * oddcolor: Odd row background color in DW_RGB format or a default color index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574 * evencolor: Even row background color in DW_RGB format or a default color index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7575 * DW_RGB_TRANSPARENT will disable coloring rows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7576 * DW_CLR_DEFAULT will use the system default alternating row colors.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7577 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7578 DW_FUNCTION_DEFINITION(dw_container_set_stripe, void, HWND handle, unsigned long oddcolor, unsigned long evencolor)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7579 DW_FUNCTION_ADD_PARAM3(handle, oddcolor, evencolor)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7580 DW_FUNCTION_NO_RETURN(dw_container_set_stripe)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7581 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, oddcolor, unsigned long, evencolor, unsigned long)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7582 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7583 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7584 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7585 [cont setRowBgOdd:oddcolor
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7586 andEven:evencolor];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7587 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7588 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7589
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7590 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7591 * Sets the width of a column in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7592 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7593 * handle: Handle to window (widget) of container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7594 * column: Zero based column of width being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7595 * width: Width of column in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7596 */
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7597 void API dw_container_set_column_width(HWND handle, int column, int width)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7598 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7599 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7600
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7601 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7602 * Sets the title of a row in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7603 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7604 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7605 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7606 * title: String title of the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7607 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7608 DW_FUNCTION_DEFINITION(dw_container_set_row_title, void, void pointer, int row, const char title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7609 DW_FUNCTION_ADD_PARAM3(pointer, row, title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7610 DW_FUNCTION_NO_RETURN(dw_container_set_row_title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7611 DW_FUNCTION_RESTORE_PARAM3(pointer, void , row, int, title, char )
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7612 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7613 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7614 DWContainer *cont = pointer;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7615 int lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7616 [cont setRow:(row+lastadd) title:title];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7617 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7618 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7619
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7620
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7621 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7622 * Sets the data pointer of a row in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7623 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7624 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7625 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7626 * data: Data pointer.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7627 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7628 DW_FUNCTION_DEFINITION(dw_container_set_row_data, void, void pointer, int row, void data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7629 DW_FUNCTION_ADD_PARAM3(pointer, row, data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7630 DW_FUNCTION_NO_RETURN(dw_container_set_row_data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7631 DW_FUNCTION_RESTORE_PARAM3(pointer, void , row, int, data, void )
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7632 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7633 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7634 DWContainer *cont = pointer;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7635 int lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7636 [cont setRowData:(row+lastadd) title:data];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7637 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7638 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7639
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7640
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7641 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7642 * Sets the title of a row in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7643 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7644 * handle: Handle to window (widget) of container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7645 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7646 * title: String title of the item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7647 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7648 DW_FUNCTION_DEFINITION(dw_container_change_row_title, void, HWND handle, int row, const char *title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7649 DW_FUNCTION_ADD_PARAM3(handle, row, title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7650 DW_FUNCTION_NO_RETURN(dw_container_change_row_title)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7651 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, title, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7652 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7653 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7654 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7655 [cont setRow:row title:title];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7656 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7657 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7658
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7659 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7660 * Sets the data pointer of a row in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7661 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7662 * handle: Handle to window (widget) of container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7663 * row: Zero based row of data being set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7664 * data: Data pointer.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7665 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7666 DW_FUNCTION_DEFINITION(dw_container_change_row_data, void, HWND handle, int row, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7667 DW_FUNCTION_ADD_PARAM3(handle, row, data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7668 DW_FUNCTION_NO_RETURN(dw_container_change_row_data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7669 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, data, void *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7670 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7671 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7672 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 [cont setRowData:row title:data];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7675 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7676
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7677 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7678 * Sets the title of a row in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7679 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7680 * handle: Handle to the container window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7681 * pointer: Pointer to the allocated memory in dw_container_alloc().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7682 * rowcount: The number of rows to be inserted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7683 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7684 DW_FUNCTION_DEFINITION(dw_container_insert, void, HWND handle, void *pointer, int rowcount)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7685 DW_FUNCTION_ADD_PARAM3(handle, pointer, rowcount)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7686 DW_FUNCTION_NO_RETURN(dw_container_insert)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7687 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, DW_UNUSED(pointer), void *, DW_UNUSED(rowcount), int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7688 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7689 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7690 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7691 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7692 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7693 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7694
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7695 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7696 * Removes all rows from a container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7697 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7698 * handle: Handle to the window (widget) to be cleared.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7699 * redraw: TRUE to cause the container to redraw immediately.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7700 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7701 DW_FUNCTION_DEFINITION(dw_container_clear, void, HWND handle, int redraw)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7702 DW_FUNCTION_ADD_PARAM2(handle, redraw)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7703 DW_FUNCTION_NO_RETURN(dw_container_clear)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, redraw, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7705 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7706 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7707 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7708 [cont clear];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7709 if(redraw)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7710 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7711 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7714 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7715 * Removes the first x rows from a container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7716 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7717 * handle: Handle to the window (widget) to be deleted from.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7718 * rowcount: The number of rows to be deleted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7719 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7720 DW_FUNCTION_DEFINITION(dw_container_delete, void, HWND handle, int rowcount)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7721 DW_FUNCTION_ADD_PARAM2(handle, rowcount)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 DW_FUNCTION_NO_RETURN(dw_container_delete)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7723 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, rowcount, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7724 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7725 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7727 int x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7728
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7729 for(x=0;x<rowcount;x++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7730 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 [cont removeRow:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7732 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7733 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7735 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7736
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7737 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7738 * Scrolls container up or down.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7739 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7740 * handle: Handle to the window (widget) to be scrolled.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7741 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7743 * rows: The number of rows to be scrolled.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7744 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	7745 DW_FUNCTION_DEFINITION(dw_container_scroll, void, HWND handle, int direction, DW_UNUSED(long rows))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7746 DW_FUNCTION_ADD_PARAM3(handle, direction, rows)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7747 DW_FUNCTION_NO_RETURN(dw_container_scroll)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	7748 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, direction, int, DW_UNUSED(rows), long)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7749 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7750 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7751 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7752 int rowcount = (int)[cont numberOfRowsInSection:0];
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	7753 CGPoint offset = [cont contentOffset];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7754
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7755 /* Safety check */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756 if(rowcount < 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7757 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7758 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7759 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7760
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7761 switch(direction)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7762 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7763 case DW_SCROLL_TOP:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7764 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7765 offset.y = 0;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7767 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7768 case DW_SCROLL_BOTTOM:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7769 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	7770 offset.y = [cont contentSize].height - [cont visibleSize].height;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7771 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7772 }
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	7773 /* TODO: Currently scrolling a full page, need to use row parameter instead */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7774 case DW_SCROLL_UP:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7775 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	7776 offset.y -= [cont visibleSize].height;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7777 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7778 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7779 case DW_SCROLL_DOWN:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7780 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	7781 offset.y += [cont visibleSize].height;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7782 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7783 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7784 }
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7785 if(offset.y < 0)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7786 offset.y = 0;
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	7787 [cont setContentOffset:offset];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7788 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7789 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7790
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7791 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7792 * Starts a new query of a container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7793 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7794 * handle: Handle to the window (widget) to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7795 * flags: If this parameter is DW_CRA_SELECTED it will only
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7796 * return items that are currently selected. Otherwise
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7797 * it will return all records in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7798 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7799 DW_FUNCTION_DEFINITION(dw_container_query_start, char *, HWND handle, unsigned long flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7800 DW_FUNCTION_ADD_PARAM2(handle, flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7801 DW_FUNCTION_RETURN(dw_container_query_start, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7802 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7803 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7804 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805 DWContainer *cont = handle;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7806 NSArray *selected = [cont indexPathsForSelectedRows];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	7807 NSIndexPath *result = [selected firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808 void *retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7809
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7810 if(result)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7812 if(flags & DW_CR_RETDATA)
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7813 retval = [cont getRowData:(int)result.row];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7816 char *temp = [cont getRowTitle:(int)result.row];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7818 retval = strdup(temp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7819 }
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7820 [cont setLastQueryPoint:1];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7821 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7825 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7826 * Continues an existing query of a container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7827 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7828 * handle: Handle to the window (widget) to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 * flags: If this parameter is DW_CRA_SELECTED it will only
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7830 * return items that are currently selected. Otherwise
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7831 * it will return all records in the container.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7832 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7833 DW_FUNCTION_DEFINITION(dw_container_query_next, char *, HWND handle, unsigned long flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7834 DW_FUNCTION_ADD_PARAM2(handle, flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7835 DW_FUNCTION_RETURN(dw_container_query_next, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7836 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7837 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7838 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7839 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7840 int lastQueryPoint = [cont lastQueryPoint];
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7841 NSArray *selected = [cont indexPathsForSelectedRows];
2429 89f4aba2e387 iOS: Put back missing tree selection code, since it is apparently also used bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2428 diff changeset	7842 NSIndexPath *result = lastQueryPoint < [selected count] ? [selected objectAtIndex:lastQueryPoint] : nil;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7843 void *retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7844
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7845 if(result)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7846 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 if(flags & DW_CR_RETDATA)
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7848 retval = [cont getRowData:(int)result.row];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7849 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7851 char *temp = [cont getRowTitle:(int)result.row];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7852 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7853 retval = strdup(temp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7854 }
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7855 [cont setLastQueryPoint:(int)lastQueryPoint+1];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7856 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7857 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7858 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7860 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861 * Cursors the item with the text speficied, and scrolls to that item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7862 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7863 * handle: Handle to the window (widget) to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 * text: Text usually returned by dw_container_query().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7865 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7866 DW_FUNCTION_DEFINITION(dw_container_cursor, void, HWND handle, const char *text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7867 DW_FUNCTION_ADD_PARAM2(handle, text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7868 DW_FUNCTION_NO_RETURN(dw_container_cursor)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7869 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7870 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7871 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7872 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7873 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7874 char *thistext;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7875 int x, count = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7876
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7877 for(x=0;x<count;x++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7878 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7879 thistext = [cont getRowTitle:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7880
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7881 if(thistext && strcmp(thistext, text) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7882 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7883 NSIndexPath *ip = [NSIndexPath indexPathForRow:(NSUInteger)x inSection:0];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7884
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7885 [cont selectRowAtIndexPath:ip
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7886 animated:NO
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7887 scrollPosition:UITableViewScrollPositionNone];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7888 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7889 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7890 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7891 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7892 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7894 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7895
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7896 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7897 * Cursors the item with the data speficied, and scrolls to that item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7898 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7899 * handle: Handle to the window (widget) to be queried.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7900 * data: Data associated with the row.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7901 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7902 DW_FUNCTION_DEFINITION(dw_container_cursor_by_data, void, HWND handle, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7903 DW_FUNCTION_ADD_PARAM2(handle, data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7904 DW_FUNCTION_NO_RETURN(dw_container_cursor_by_data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7905 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, data, void *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7906 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7907 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7908 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7909 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7910 void *thisdata;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7911 int x, count = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7912
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7913 for(x=0;x<count;x++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7914 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7915 thisdata = [cont getRowData:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7916
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7917 if(thisdata == data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7918 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7919 NSIndexPath *ip = [NSIndexPath indexPathForRow:(NSUInteger)x inSection:0];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7920
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7921 [cont selectRowAtIndexPath:ip
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7922 animated:NO
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7923 scrollPosition:UITableViewScrollPositionNone];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7924 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7925 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7926 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7927 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7928 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7929 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7932 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7933 * Deletes the item with the text speficied.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7935 * handle: Handle to the window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7936 * text: Text usually returned by dw_container_query().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7937 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7938 DW_FUNCTION_DEFINITION(dw_container_delete_row, void, HWND handle, const char *text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7939 DW_FUNCTION_ADD_PARAM2(handle, text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7940 DW_FUNCTION_NO_RETURN(dw_container_delete_row)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7941 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7942 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7943 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7945 char *thistext;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7946 int x, count = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7947
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7948 for(x=0;x<count;x++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950 thistext = [cont getRowTitle:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952 if(thistext && strcmp(thistext, text) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 [cont removeRow:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7955 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7960 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964 * Deletes the item with the data speficied.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7965 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7966 * handle: Handle to the window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 * data: Data specified.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7968 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7969 DW_FUNCTION_DEFINITION(dw_container_delete_row_by_data, void, HWND handle, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 DW_FUNCTION_ADD_PARAM2(handle, data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 DW_FUNCTION_NO_RETURN(dw_container_delete_row_by_data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, data, void *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7976 void *thisdata;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7977 int x, count = (int)[cont numberOfRowsInSection:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979 for(x=0;x<count;x++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981 thisdata = [cont getRowData:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7983 if(thisdata == data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 [cont removeRow:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7987 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7988 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7989 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7991 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7994 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7995 * Optimizes the column widths so that all data is visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997 * handle: Handle to the window (widget) to be optimized.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7998 */
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7999 void dw_container_optimize(HWND handle)
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	8000 {
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	8001 /* TODO: Not sure if we need to implement this on iOS */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8003
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8005 * Inserts an icon into the taskbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 * handle: Window handle that will handle taskbar icon messages.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 * icon: Icon handle to display in the taskbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8009 * bubbletext: Text to show when the mouse is above the icon.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8011 void API dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8012 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8013 /* Taskbar unsupported on iOS */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017 * Deletes an icon from the taskbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8019 * handle: Window handle that was used with dw_taskbar_insert().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020 * icon: Icon handle that was used with dw_taskbar_insert().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8022 void API dw_taskbar_delete(HWND handle, HICN icon)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8023 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8024 /* Taskbar unsupported on iOS */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8025 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8026
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8027 /* Internal function to keep HICNs from getting too big */
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8028 UIImage _dw_icon_resize(UIImage image)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8031 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	8032 CGSize size = [image size];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 if(size.width > 24 \|\| size.height > 24)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 if(size.width > 24)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 size.width = 24;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037 if(size.height > 24)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038 size.height = 24;
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8039 // Pass 0.0 to use the current device's pixel scaling factor (and thus account for Retina resolution).
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8040 // Pass 1.0 to force exact pixel size.
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8041 UIGraphicsBeginImageContextWithOptions(size, NO, 0.0);
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8042 [image drawInRect:CGRectMake(0, 0, size.width, size.height)];
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8043 UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8044 UIGraphicsEndImageContext();
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8045 return newImage;
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8046 }
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8047 }
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8048 return image;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8049 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8050
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8051 /* Internal version that does not resize the image */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8052 HICN _dw_icon_load(unsigned long resid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8053 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8054 NSBundle *bundle = [NSBundle mainBundle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8055 NSString *respath = [bundle resourcePath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8056 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8057 UIImage *image = [[UIImage alloc] initWithContentsOfFile:filepath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 return image;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8059 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8060
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8061 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8062 * Obtains an icon from a module (or header in GTK).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8063 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8064 * module: Handle to module (DLL) in OS/2 and Windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 * id: A unsigned long id int the resources on OS/2 and
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066 * Windows, on GTK this is converted to a pointer
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 * to an embedded XPM.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8068 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 HICN API dw_icon_load(unsigned long module, unsigned long resid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8071 UIImage *image = _dw_icon_load(resid);
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8072 return _dw_icon_resize(image);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8076 * Obtains an icon from a file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8077 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8078 * filename: Name of the file, omit extention to have
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 * DW pick the appropriate file extension.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8080 * (ICO on OS/2 or Windows, XPM on Unix)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8081 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8082 HICN API dw_icon_load_from_file(const char *filename)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8083 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8084 char *ext = _dw_get_image_extension( filename );
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8085
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086 NSString *nstr = [ NSString stringWithUTF8String:filename ];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8087 UIImage *image = [[UIImage alloc] initWithContentsOfFile:nstr];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8088 if(!image && ext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8089 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8090 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8091 image = [[UIImage alloc] initWithContentsOfFile:nstr];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 }
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8093 return _dw_icon_resize(image);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8094 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8096 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097 * Obtains an icon from data
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8098 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099 * filename: Name of the file, omit extention to have
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8100 * DW pick the appropriate file extension.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8101 * (ICO on OS/2 or Windows, XPM on Unix)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8102 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8103 HICN API dw_icon_load_from_data(const char *data, int len)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8104 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8105 NSData *thisdata = [NSData dataWithBytes:data length:len];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 UIImage *image = [[UIImage alloc] initWithData:thisdata];
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8107 return _dw_icon_resize(image);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 * Frees a loaded resource in OS/2 and Windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8113 * handle: Handle to icon returned by dw_icon_load().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8115 void API dw_icon_free(HICN handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 UIImage *image = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8118 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119 [image release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8121 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8123 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 * Create a new MDI Frame to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8125 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126 * id: An ID to be used with dw_window_from_id or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8127 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8128 HWND API dw_mdi_new(unsigned long cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130 /* There isn't anything like quite like MDI on MacOS...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 * However we will make floating windows that hide
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8132 * when the application is deactivated to simulate
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8133 * similar behavior.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 */
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	8135 DWMDI *mdi = [[[DWMDI alloc] init] retain];
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	8136 [mdi setTag:cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 return mdi;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8138 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8140 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141 * Creates a splitbar window (widget) with given parameters.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8143 * type: Value can be DW_VERT or DW_HORZ.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8144 * topleft: Handle to the window to be top or left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8145 * bottomright: Handle to the window to be bottom or right.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147 * A handle to a splitbar window or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 */
2641 608598b9fed9 iOS: UISplitViewController may not be the right way to implement DWSplitBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2640 diff changeset	8149 DW_FUNCTION_DEFINITION(dw_splitbar_new, HWND, int type, HWND topleft, HWND bottomright, unsigned long cid)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8150 DW_FUNCTION_ADD_PARAM4(type, topleft, bottomright, cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151 DW_FUNCTION_RETURN(dw_splitbar_new, HWND)
2641 608598b9fed9 iOS: UISplitViewController may not be the right way to implement DWSplitBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2640 diff changeset	8152 DW_FUNCTION_RESTORE_PARAM4(type, int, topleft, HWND, bottomright, HWND, cid, unsigned long)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8153 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155 id tmpbox = dw_box_new(DW_VERT, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8156 DWSplitBar *split = [[DWSplitBar alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8157 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8158 [split setTopLeft:tmpbox];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8159 tmpbox = dw_box_new(DW_VERT, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160 dw_box_pack_start(tmpbox, bottomright, 0, 0, TRUE, TRUE, 0);
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8161 [split setBottomRight:tmpbox];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8162 [split setPercent:50.0];
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8163 [split setType:type];
2641 608598b9fed9 iOS: UISplitViewController may not be the right way to implement DWSplitBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2640 diff changeset	8164 [split setTag:cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 DW_FUNCTION_RETURN_THIS(split);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8166 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8167
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8168 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8169 * Sets the position of a splitbar (pecentage).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8170 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8171 * handle: The handle to the splitbar returned by dw_splitbar_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8172 * percent: The position of the splitbar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8173 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8174 DW_FUNCTION_DEFINITION(dw_splitbar_set, void, HWND handle, float percent)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8175 DW_FUNCTION_ADD_PARAM2(handle, percent)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8176 DW_FUNCTION_NO_RETURN(dw_splitbar_set)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8177 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, percent, float)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8178 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180 DWSplitBar *split = handle;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8181 [split setPercent:percent];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8183 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8184
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8186 * Gets the position of a splitbar (pecentage).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8187 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8188 * handle: The handle to the splitbar returned by dw_splitbar_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 float API dw_splitbar_get(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8192 DWSplitBar *split = handle;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8193 float retval = 50.0;
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8194
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8195 if(split)
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8196 retval = [split percent];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 return retval;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8198 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8200 /* Internal function to convert fontname to UIFont */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8201 UIFont _dw_font_by_name(const char fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8202 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8203 UIFont *font = DWDefaultFont;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8204
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8205 if(fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8206 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8207 char *name = strchr(fontname, '.');
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8209 if(name && (name++))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8210 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8211 UIFontDescriptorSymbolicTraits traits = 0;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8212 UIFontDescriptor* fd;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8213 int size = atoi(fontname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214 char *Italic = strstr(name, " Italic");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8215 char *Bold = strstr(name, " Bold");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8216 size_t len = (Italic ? (Bold ? (Italic > Bold ? (Bold - name) : (Italic - name)) : (Italic - name)) : (Bold ? (Bold - name) : strlen(name)));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8217 char *newname = alloca(len+1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219 memset(newname, 0, len+1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 strncpy(newname, name, len);
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8221
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8222 if(Bold)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8223 traits \|= UIFontDescriptorTraitBold;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8224 if(Italic)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8225 traits \|= UIFontDescriptorTraitItalic;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8226
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8227 fd = [UIFontDescriptor
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8228 fontDescriptorWithFontAttributes:@{UIFontDescriptorFamilyAttribute:[NSString stringWithUTF8String:newname],
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8229 UIFontDescriptorTraitsAttribute: @{UIFontSymbolicTrait:[NSNumber numberWithInteger:traits]}}];
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8230 NSArray* matches = [fd matchingFontDescriptorsWithMandatoryKeys:
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8231 [NSSet setWithObjects:UIFontDescriptorFamilyAttribute, UIFontDescriptorTraitsAttribute, nil]];
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8232 if(matches.count != 0)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8233 font = [UIFont fontWithDescriptor:matches[0] size:size];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8234 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8235 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8236 return font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8237 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8238
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8239 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8240 * Create a bitmap object to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8241 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8242 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8243 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8244 DW_FUNCTION_DEFINITION(dw_bitmap_new, HWND, ULONG cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8245 DW_FUNCTION_ADD_PARAM1(cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246 DW_FUNCTION_RETURN(dw_bitmap_new, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8247 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8248 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 DW_FUNCTION_INIT;
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	8250 UIImageView *bitmap = [[[UIImageView alloc] init] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251 [bitmap setTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8252 DW_FUNCTION_RETURN_THIS(bitmap);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8256 * Creates a pixmap with given parameters.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8258 * handle: Window handle the pixmap is associated with.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8259 * width: Width of the pixmap in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 * height: Height of the pixmap in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8261 * depth: Color depth of the pixmap.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 * A handle to a pixmap or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8267 HPIXMAP pixmap = NULL;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8268
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8269 if((pixmap = calloc(1,sizeof(struct _hpixmap))))
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8270 {
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8271 pixmap->width = width;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8272 pixmap->height = height;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8273 pixmap->handle = handle;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	8274 pixmap->image = [[[DWImage alloc] initWithSize:CGSizeMake(width,height)] retain];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8275 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8276 return pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8277 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8278
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8280 * Creates a pixmap from a file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8281 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8282 * handle: Window handle the pixmap is associated with.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283 * filename: Name of the file, omit extention to have
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8284 * DW pick the appropriate file extension.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285 * (BMP on OS/2 or Windows, XPM on Unix)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 * A handle to a pixmap or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289 HPIXMAP API dw_pixmap_new_from_file(HWND handle, const char *filename)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8290 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8291 HPIXMAP pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8292 DW_LOCAL_POOL_IN;
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8293 char *ext = _dw_get_image_extension(filename);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8294
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8295 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8297 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8299 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8300 NSString *nstr = [ NSString stringWithUTF8String:filename ];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8301 UIImage *tmpimage = [[UIImage alloc] initWithContentsOfFile:nstr];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8302 if(!tmpimage && ext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8303 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8305 tmpimage = [[UIImage alloc] initWithContentsOfFile:nstr];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8306 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8307 if(!tmpimage)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8308 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8311 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8312 pixmap->width = [tmpimage size].width;
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8313 pixmap->height = [tmpimage size].height;
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8314 pixmap->image = [[[DWImage alloc] initWithUIImage:tmpimage] retain];
2447 8723c01fb87e iOS: Fix bug in dw_pixmap_new_from_file(). Resources go into the app bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2445 diff changeset	8315 pixmap->handle = handle;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8317 return pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8319
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8320 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321 * Creates a pixmap from memory.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8323 * handle: Window handle the pixmap is associated with.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 * data: Source of the image data
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8325 * (BMP on OS/2 or Windows, XPM on Unix)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8326 * le: length of data
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328 * A handle to a pixmap or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8329 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 HPIXMAP API dw_pixmap_new_from_data(HWND handle, const char *data, int len)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8331 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 HPIXMAP pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8335 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8337 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340 NSData *thisdata = [NSData dataWithBytes:data length:len];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8341 UIImage *tmpimage = [[UIImage alloc] initWithData:thisdata];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8342 if(!tmpimage)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8343 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8347 pixmap->width = [tmpimage size].width;
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8348 pixmap->height = [tmpimage size].height;
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8349 pixmap->image = [[[DWImage alloc] initWithUIImage:tmpimage] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 pixmap->handle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8351 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8352 return pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8353 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8354
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8355 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 * Sets the transparent color for a pixmap
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358 * pixmap: Handle to a pixmap returned by
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8359 * dw_pixmap_new..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8360 * color: transparent color
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8361 * Note: This does nothing on Mac as transparency
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8362 * is handled automatically
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 */
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8364 void API dw_pixmap_set_transparent_color(HPIXMAP pixmap, ULONG color)
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8365 {
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8366 /* Don't do anything, all images support transparency on iOS */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8368
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8370 * Creates a pixmap from internal resource graphic specified by id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8371 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8372 * handle: Window handle the pixmap is associated with.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8373 * id: Resource ID associated with requested pixmap.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8374 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8375 * A handle to a pixmap or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8376 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8377 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG resid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8379 HPIXMAP pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8380 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8381
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8384 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8385 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8386 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8387
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8388 NSBundle *bundle = [NSBundle mainBundle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8389 NSString *respath = [bundle resourcePath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8391 UIImage *tmpimage = [[UIImage alloc] initWithContentsOfFile:filepath];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8393 if(tmpimage)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8394 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8395 pixmap->width = [tmpimage size].width;
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8396 pixmap->height = [tmpimage size].height;
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	8397 pixmap->image = [[DWImage alloc] initWithUIImage:tmpimage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8398 pixmap->handle = handle;
2412 3b59cbd26fab iOS/Mac: Fix a minor memory leak in dw_pixmap_grab(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2411 diff changeset	8399 DW_LOCAL_POOL_OUT;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8400 return pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8401 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8402 free(pixmap);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8403 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8404 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8406
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8407 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8408 * Sets the font used by a specified pixmap.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8409 * Normally the pixmap font is obtained from the associated window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8410 * However this can be used to override that, or for pixmaps with no window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8411 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8412 * pixmap: Handle to a pixmap returned by dw_pixmap_new() or
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8413 * passed to the application via a callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8414 * fontname: Name and size of the font in the form "size.fontname"
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8415 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8416 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8417 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8418 int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8419 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8420 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8421 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8422 UIFont *font = _dw_font_by_name(fontname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8423
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8424 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8425 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8426 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8427 UIFont *oldfont = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8428 [font retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8429 pixmap->font = font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8430 if(oldfont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8431 [oldfont release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8432 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8433 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8435 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436 return DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8439 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8440 * Destroys an allocated pixmap.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8442 * pixmap: Handle to a pixmap returned by
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 * dw_pixmap_new..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8445 void API dw_pixmap_destroy(HPIXMAP pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8447 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448 {
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	8449 DWImage image = (DWImage )pixmap->image;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 UIFont *font = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8451 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8452 [image release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8453 [font release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8454 free(pixmap);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8455 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8456 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8457 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8458
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8459 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8460 * Copies from one item to another.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8461 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462 * dest: Destination window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 * destp: Destination pixmap. (choose only one).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8464 * xdest: X coordinate of destination.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8465 * ydest: Y coordinate of destination.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466 * width: Width of area to copy.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8467 * height: Height of area to copy.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8468 * src: Source window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8469 * srcp: Source pixmap. (choose only one).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8470 * xsrc: X coordinate of source.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8471 * ysrc: Y coordinate of source.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8472 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8473 void API dw_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8474 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8475 dw_pixmap_stretch_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, -1, -1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8476 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8477
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8478 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8479 * Copies from one surface to another allowing for stretching.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8480 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8481 * dest: Destination window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8482 * destp: Destination pixmap. (choose only one).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8483 * xdest: X coordinate of destination.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 * ydest: Y coordinate of destination.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8485 * width: Width of the target area.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8486 * height: Height of the target area.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8487 * src: Source window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 * srcp: Source pixmap. (choose only one).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8489 * xsrc: X coordinate of source.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 * ysrc: Y coordinate of source.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8491 * srcwidth: Width of area to copy.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492 * srcheight: Height of area to copy.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8493 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8494 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8495 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8496 int API dw_pixmap_stretch_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8498 DWBitBlt *bltinfo;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 NSValue* bi;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8502 /* Sanity checks */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8503 if((!dest && !destp) \|\| (!src && !srcp) \|\|
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 ((srcwidth == -1 \|\| srcheight == -1) && srcwidth != srcheight))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8505 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8506 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8507 return DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 bltinfo = calloc(1, sizeof(DWBitBlt));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8511 bi = [NSValue valueWithPointer:bltinfo];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8512
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8513 /* Fill in the information */
2436 ab36fbb50fe5 iOS: Fixes to get cachedImage functionality working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2435 diff changeset	8514 bltinfo->dest = _dw_dest_image(destp, dest);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515 bltinfo->src = src;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8516 bltinfo->xdest = xdest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 bltinfo->ydest = ydest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 bltinfo->width = width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519 bltinfo->height = height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520 bltinfo->xsrc = xsrc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521 bltinfo->ysrc = ysrc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8522 bltinfo->srcwidth = srcwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523 bltinfo->srcheight = srcheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8525 if(srcp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8526 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8527 id object = bltinfo->src = (id)srcp->image;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528 [object retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8529 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8530 [DWObj safeCall:@selector(doBitBlt:) withObject:bi];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8532 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8533 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8534
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8535 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8536 * Create a new static text window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8537 * Not available under OS/2, eCS
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8538 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8539 * text: The text to be display by the static text widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8540 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8541 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	8542 DW_FUNCTION_DEFINITION(dw_calendar_new, HWND, ULONG cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	8543 DW_FUNCTION_ADD_PARAM1(cid)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	8544 DW_FUNCTION_RETURN(dw_calendar_new, HWND)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	8545 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	8547 DWCalendar *calendar = [[[DWCalendar alloc] init] retain];
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8548 if (@available(iOS 14.0, *)) {
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8549 [calendar setPreferredDatePickerStyle:UIDatePickerStyleInline];
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8550 } else {
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8551 // We really want the iOS 14 style to match the other platforms...
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8552 // but just leave it the default spinner style on 13 and earlier.
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8553 }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8554 [calendar setDatePickerMode:UIDatePickerModeDate];
2583 1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8555 [calendar setDate:[NSDate date]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8556 [calendar setTag:cid];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	8557 DW_FUNCTION_RETURN_THIS(calendar);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8558 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8559
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8560 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8561 * Sets the current date of a calendar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8562 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8563 * handle: The handle to the calendar returned by dw_calendar_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8564 * year...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8565 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8566 DW_FUNCTION_DEFINITION(dw_calendar_set_date, void, HWND handle, unsigned int year, unsigned int month, unsigned int day)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8567 DW_FUNCTION_ADD_PARAM4(handle, year, month, day)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8568 DW_FUNCTION_NO_RETURN(dw_calendar_set_date)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8569 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, year, unsigned int, month, unsigned int, day, unsigned int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8570 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8571 DWCalendar *calendar = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 NSDate *date;
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	8573 char buffer[101] = {0};
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8574
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8575 snprintf(buffer, 100, "%04d-%02d-%02d", year, month, day);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8576
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8577 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8578 dateFormatter.dateFormat = @"yyyy-MM-dd";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8579
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8580 date = [dateFormatter dateFromString:[NSString stringWithUTF8String:buffer]];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8581 [calendar setDate:date];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8582 [date release];
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8583 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8584 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8585
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 * Gets the current date of a calendar.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 * handle: The handle to the calendar returned by dw_calendar_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8591 DW_FUNCTION_DEFINITION(dw_calendar_get_date, void, HWND handle, unsigned int year, unsigned int month, unsigned int *day)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8592 DW_FUNCTION_ADD_PARAM4(handle, year, month, day)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8593 DW_FUNCTION_NO_RETURN(dw_calendar_get_date)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8594 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, year, unsigned int , month, unsigned int , day, unsigned int *)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8595 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8596 DWCalendar *calendar = handle;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8597 NSCalendar *mycalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8598 NSDate *date = [calendar date];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8599 NSDateComponents* components = [mycalendar components:NSCalendarUnitDay\|NSCalendarUnitMonth\|NSCalendarUnitYear fromDate:date];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600 *day = (unsigned int)[components day];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601 *month = (unsigned int)[components month];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8602 *year = (unsigned int)[components year];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8603 [mycalendar release];
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8604 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8607 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8608 * Causes the embedded HTML widget to take action.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8609 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8611 * action: One of the DW_HTML_* constants.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8613 DW_FUNCTION_DEFINITION(dw_html_action, void, HWND handle, int action)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8614 DW_FUNCTION_ADD_PARAM2(handle, action)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8615 DW_FUNCTION_NO_RETURN(dw_html_action)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8616 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, action, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8618 DWWebView *html = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619 switch(action)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8620 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 case DW_HTML_GOBACK:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 [html goBack];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8623 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8624 case DW_HTML_GOFORWARD:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8625 [html goForward];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8626 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8627 case DW_HTML_GOHOME:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8628 dw_html_url(handle, DW_HOME_URL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 case DW_HTML_SEARCH:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8631 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8632 case DW_HTML_RELOAD:
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8633 [html reload];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8634 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8635 case DW_HTML_STOP:
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8636 [html stopLoading];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8637 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8638 case DW_HTML_PRINT:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8639 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8640 }
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8641 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8642 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8643
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8644 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8645 * Render raw HTML code in the embedded HTML widget..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8646 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8647 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8648 * string: String buffer containt HTML code to
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8649 * be rendered.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8650 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8651 * 0 on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8652 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8653 DW_FUNCTION_DEFINITION(dw_html_raw, int, HWND handle, const char *string)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8654 DW_FUNCTION_ADD_PARAM2(handle, string)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8655 DW_FUNCTION_RETURN(dw_html_raw, int)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8656 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, string, const char *)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8657 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8658 DWWebView *html = handle;
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8659 int retval = DW_ERROR_NONE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8660 [html loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8661 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8662 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8663
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8664 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8665 * Render file or web page in the embedded HTML widget..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8666 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8667 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8668 * url: Universal Resource Locator of the web or
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8669 * file object to be rendered.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8670 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8671 * 0 on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8672 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8673 DW_FUNCTION_DEFINITION(dw_html_url, int, HWND handle, const char *url)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8674 DW_FUNCTION_ADD_PARAM2(handle, url)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8675 DW_FUNCTION_RETURN(dw_html_url, int)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8676 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, url, const char *)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8677 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8678 DWWebView *html = handle;
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8679 int retval = DW_ERROR_NONE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8680 [html loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8681 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8683
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8684 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685 * Executes the javascript contained in "script" in the HTML window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8686 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8687 * handle: Handle to the HTML window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8688 * script: Javascript code to execute.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 * scriptdata: Data passed to the signal handler.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8690 * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8691 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8692 * DW_ERROR_NONE (0) on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8693 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8694 DW_FUNCTION_DEFINITION(dw_html_javascript_run, int, HWND handle, const char script, void scriptdata)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8695 DW_FUNCTION_ADD_PARAM3(handle, script, scriptdata)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8696 DW_FUNCTION_RETURN(dw_html_javascript_run, int)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8697 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, script, const char , scriptdata, void )
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8698 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8699 DWWebView *html = handle;
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8700 int retval = DW_ERROR_NONE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8701 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8702
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8703 [html evaluateJavaScript:[NSString stringWithUTF8String:script] completionHandler:^(NSString result, NSError error)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8704 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8705 void *params[2] = { result, scriptdata };
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	8706 _dw_event_handler(html, (id)params, _DW_EVENT_HTML_RESULT);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8707 }];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8708 DW_LOCAL_POOL_OUT;
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8709 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8710 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8711
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8712 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8713 * Create a new HTML window (widget) to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 * Not available under OS/2, eCS
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8715 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8716 * text: The default text to be in the entryfield widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8717 * id: An ID to be used with dw_window_from_id() or 0L.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8718 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8719 DW_FUNCTION_DEFINITION(dw_html_new, HWND, ULONG cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8720 DW_FUNCTION_ADD_PARAM1(cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8721 DW_FUNCTION_RETURN(dw_html_new, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8722 DW_FUNCTION_RESTORE_PARAM1(DW_UNUSED(cid), ULONG)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8723 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724 DW_FUNCTION_INIT;
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	8725 DWWebView *web = [[[DWWebView alloc] init] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8726 web.navigationDelegate = web;
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	8727 [web setTag:cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728 DW_FUNCTION_RETURN_THIS(web);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8729 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8730
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8731 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8732 * Returns the current X and Y coordinates of the mouse pointer.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8733 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8734 * x: Pointer to variable to store X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8735 * y: Pointer to variable to store Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8736 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8737 void API dw_pointer_query_pos(long x, long y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8738 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8739 if(x)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8740 {
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	8741 *x = (long)_dw_event_point.x;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8742 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8743 if(y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8744 {
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	8745 *y = (long)_dw_event_point.y;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8746 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8747 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8748
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8749 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750 * Sets the X and Y coordinates of the mouse pointer.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8751 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8752 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8753 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8754 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8755 void API dw_pointer_set_pos(long x, long y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8756 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8757 /* From what I have read this isn't possible, agaist human interface rules */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8758 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8759
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8760 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8761 * Create a menu object to be popped up.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8762 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8763 * id: An ID to be used for getting the resource from the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8764 * resource file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8765 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8766 HMENUI API dw_menu_new(ULONG cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8767 {
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8768 DWMenu *menu = [[[DWMenu alloc] initWithTag:cid] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8769 return menu;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8770 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8771
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8772 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8773 * Create a menubar on a window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 * location: Handle of a window frame to be attached to.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8776 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8777 HMENUI API dw_menubar_new(HWND location)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778 {
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	8779 DWWindow *window = location;
2577 6fdab466d7a2 Android: Fix notebook page change event page always being 0. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2570 diff changeset	8780 DWMenu *menu = [[[DWMenu alloc] initWithTag:0] retain];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	8781
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	8782 [window setMenu:menu];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	8783 return menu;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8785
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8787 * Destroys a menu created with dw_menubar_new or dw_menu_new.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8788 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8789 * menu: Handle of a menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8790 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8791 void API dw_menu_destroy(HMENUI *menu)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8792 {
2615 ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8793 if(menu)
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8794 {
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8795 DWMenu thismenu = menu;
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8796 DW_LOCAL_POOL_IN;
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8797 [thismenu release];
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8798 DW_LOCAL_POOL_OUT;
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8799 *menu = NULL;
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8800 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8801 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8802
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8803 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8804 * Pops up a context menu at given x and y coordinates.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8805 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8806 * menu: The handle the the existing menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8807 * parent: Handle to the window initiating the popup.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8808 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8809 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8810 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8811 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8812 {
2616 a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8813 if(menu)
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8814 {
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8815 DWMenu thismenu = (DWMenu )*menu;
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8816 id object = parent;
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8817 DWWindow window = [object isMemberOfClass:[DWWindow class]] ? object : (DWWindow )[object window];
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8818 [window setPopupMenu:thismenu];
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8819 *menu = nil;
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8820 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8821 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8822
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	8823 char _dw_removetilde(char dest, const char src)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8824 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8825 int z, cur=0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8826 char accel = '\0';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8827
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8828 for(z=0;z<strlen(src);z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8829 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8830 if(src[z] != '~')
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8831 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8832 dest[cur] = src[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8833 cur++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8834 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8835 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8836 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8837 accel = src[z+1];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8838 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8839 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8840 dest[cur] = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8841 return accel;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8842 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8843
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8844 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8845 * Adds a menuitem or submenu to an existing menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8846 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8847 * menu: The handle the the existing menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8848 * title: The title text on the menu item to be added.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8849 * id: An ID to be used for message passing.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8850 * flags: Extended attributes to set on the menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8851 * end: If TRUE memu is positioned at the end of the menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8852 * check: If TRUE menu is "check"able.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853 * flags: Extended attributes to set on the menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8854 * submenu: Handle to an existing menu to be a submenu or NULL.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8855 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8856 HWND API dw_menu_append_item(HMENUI menux, const char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8857 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8858 DWMenu *menu = menux;
2604 4671ac4ad3c6 iOS: Had to switch from UIKeyCommand to UIAction for DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2603 diff changeset	8859 __block DWMenuItem *item = nil;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8860 if(!title \|\| strlen(title) == 0)
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8861 [menu addItem:[[NSNull alloc] init]];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8862 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8863 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8864 char accel[2];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8865 char *newtitle = malloc(strlen(title)+1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8866 NSString *nstr;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8867
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	8868 accel[0] = _dw_removetilde(newtitle, title);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8869 accel[1] = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8870
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8871 nstr = [NSString stringWithUTF8String:newtitle];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8872 free(newtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8873
2616 a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8874 item = [DWMenuItem actionWithTitle:nstr image:nil identifier:nil
2604 4671ac4ad3c6 iOS: Had to switch from UIKeyCommand to UIAction for DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2603 diff changeset	8875 handler:^(__kindof UIAction * _Nonnull action) {
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8876 if(check)
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8877 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8878 UIMenuElementState state = [item state] == UIMenuElementStateOn ? UIMenuElementStateOff : UIMenuElementStateOn;
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8879 [item setState:state];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8880 }
2604 4671ac4ad3c6 iOS: Had to switch from UIKeyCommand to UIAction for DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2603 diff changeset	8881 [DWObj menuHandler:item];
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8882 if(check)
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	8883 [DWObj safeCall:@selector(updateMenu:) withObject:nil];
2616 a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8884 }];
2602 cc5013e626f7 iOS: Code cleanup, make sure menu items are enabled on creation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2601 diff changeset	8885 /* Don't set the tag if the ID is 0 or -1 */
2601 3201f9e9067b iOS: Actually implement disabled menu items using UIMenuElementAttributesDisabled. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2600 diff changeset	8886 if(itemid != DW_MENU_AUTO && itemid != DW_MENU_POPUP)
3201f9e9067b iOS: Actually implement disabled menu items using UIMenuElementAttributesDisabled. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2600 diff changeset	8887 [item setTag:itemid];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8888 [menu addItem:item];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8889
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8890 if(check)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8891 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8892 [item setCheck:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8893 if(flags & DW_MIS_CHECKED)
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8894 [item setState:UIMenuElementStateOn];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8895 }
2602 cc5013e626f7 iOS: Code cleanup, make sure menu items are enabled on creation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2601 diff changeset	8896 [item setEnabled:(flags & DW_MIS_DISABLED ? NO : YES)];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8897
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8898 if(submenux)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8899 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8900 DWMenu *submenu = submenux;
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8901
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8902 [submenu setTitle:nstr];
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8903 [item setSubmenu:submenu];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8904 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8905 return item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8906 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8907 return item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8908 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8909
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8910 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8911 * Sets the state of a menu item check.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8912 * Deprecated; use dw_menu_item_set_state()
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8913 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8914 * menu: The handle the the existing menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8915 * id: Menuitem id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8916 * check: TRUE for checked FALSE for not checked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8917 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8918 void API dw_menu_item_set_check(HMENUI menux, unsigned long itemid, int check)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8919 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8920 id menu = menux;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8921 DWMenuItem *menuitem = [menu childWithTag:itemid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8922
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8923 if(menuitem != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8924 {
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8925 UIMenuElementState newstate = check ? UIMenuElementStateOn : UIMenuElementStateOff;
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8926
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8927 /* Only force the menus to repopulate if something changed */
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8928 if(newstate != [menuitem state])
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8929 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8930 [menuitem setState:newstate];
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	8931 [DWObj safeCall:@selector(updateMenu:) withObject:nil];
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8932 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8933 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8934 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8935
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8936 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8937 * Deletes the menu item specified.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8938 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8939 * menu: The handle to the menu in which the item was appended.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8940 * id: Menuitem id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8941 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8942 * DW_ERROR_NONE (0) on success or DW_ERROR_UNKNOWN on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8943 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8944 int API dw_menu_delete_item(HMENUI menux, unsigned long itemid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8945 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8946 id menu = menux;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8947 DWMenuItem *menuitem = [menu childWithTag:itemid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8948
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8949 if(menuitem != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8950 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8951 [menu removeItem:menuitem];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8952 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8953 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8954 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8955 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8956
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8957 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8958 * Sets the state of a menu item.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8959 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8960 * menu: The handle to the existing menu.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8961 * id: Menuitem id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8962 * flags: DW_MIS_ENABLED/DW_MIS_DISABLED
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8963 * DW_MIS_CHECKED/DW_MIS_UNCHECKED
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8964 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8965 void API dw_menu_item_set_state(HMENUI menux, unsigned long itemid, unsigned long state)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8966 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8967 id menu = menux;
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8968 DWMenuItem *menuitem = [menu childWithTag:itemid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8969
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8970 if(menuitem != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8971 {
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8972 UIMenuElementState oldstate = [menuitem state];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8973 BOOL oldenabled = [menuitem enabled];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8974
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8975 if(state & DW_MIS_CHECKED)
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8976 [menuitem setState:UIMenuElementStateOn];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8977 else if(state & DW_MIS_UNCHECKED)
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8978 [menuitem setState:UIMenuElementStateOff];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8979 if(state & DW_MIS_ENABLED)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8980 [menuitem setEnabled:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8981 else if(state & DW_MIS_DISABLED)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8982 [menuitem setEnabled:NO];
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8983
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8984 /* Only force the menus to repopulate if something changed */
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8985 if(oldstate != [menuitem state] \|\| oldenabled != [menuitem enabled])
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	8986 [DWObj safeCall:@selector(updateMenu:) withObject:nil];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8987 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8988 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8989
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8990 /* Gets the notebook page from associated ID */
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	8991 DWNotebookPage _dw_notepage_from_id(DWNotebook notebook, unsigned long pageid)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8992 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8993 NSArray *pages = [notebook views];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8994 for(DWNotebookPage *notepage in pages)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8995 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8996 if([notepage pageid] == pageid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8997 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8998 return notepage;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8999 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9000 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9001 return nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9002 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9003
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9004 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9005 * Create a notebook object to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9006 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9007 * id: An ID to be used for getting the resource from the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9008 * resource file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9009 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	9010 DW_FUNCTION_DEFINITION(dw_notebook_new, HWND, ULONG cid, DW_UNUSED(int top))
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9011 DW_FUNCTION_ADD_PARAM2(cid, top)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9012 DW_FUNCTION_RETURN(dw_notebook_new, HWND)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	9013 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, DW_UNUSED(top), int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9014 {
2405 38c17a19e00d iOS: Add adjustment for the statusbar so it isn't covered up by our windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2404 diff changeset	9015 DWNotebook *notebook = [[[DWNotebook alloc] init] retain];
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9016 [[notebook tabs] addTarget:notebook
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9017 action:@selector(pageChanged:)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9018 forControlEvents:UIControlEventValueChanged];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9019 [notebook setTag:cid];
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9020 DW_FUNCTION_RETURN_THIS(notebook);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9021 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9022
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9023 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9024 * Adds a new page to specified notebook.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9025 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9026 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9027 * flags: Any additional page creation flags.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9028 * front: If TRUE page is added at the beginning.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9029 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9030 DW_FUNCTION_DEFINITION(dw_notebook_page_new, ULONG, HWND handle, DW_UNUSED(ULONG flags), int front)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9031 DW_FUNCTION_ADD_PARAM3(handle, flags, front)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9032 DW_FUNCTION_RETURN(dw_notebook_page_new, ULONG)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9033 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, DW_UNUSED(flags), ULONG, front, int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9034 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9035 DWNotebook *notebook = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9036 NSInteger page = [notebook pageid];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	9037 DWNotebookPage *notepage = [[DWNotebookPage alloc] init];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9038 NSMutableArray<DWNotebookPage > views = [notebook views];
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9039 unsigned long retval;
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9040
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9041 [notepage setPageid:(int)page];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9042 if(front)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9043 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9044 [[notebook tabs] insertSegmentWithTitle:@"" atIndex:(NSInteger)0 animated:NO];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9045 [views addObject:notepage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9046 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9047 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9048 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9049 [[notebook tabs] insertSegmentWithTitle:@"" atIndex:[[notebook tabs] numberOfSegments] animated:NO];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9050 [views addObject:notepage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9051 }
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9052 [notebook addSubview:notepage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9053 [notebook setPageid:(int)(page+1)];
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9054
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9055 if([views count] != 1)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9056 {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9057 /* Otherwise hide the page */
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9058 [notepage setHidden:YES];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9059 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9060
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9061 retval = (unsigned long)page;
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9062 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9063 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9064
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9065 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9066 * Remove a page from a notebook.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9067 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9068 * handle: Handle to the notebook widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9069 * pageid: ID of the page to be destroyed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9070 */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9071 DW_FUNCTION_DEFINITION(dw_notebook_page_destroy, void, HWND handle, unsigned int pageid)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9072 DW_FUNCTION_ADD_PARAM2(handle, pageid)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9073 DW_FUNCTION_NO_RETURN(dw_notebook_page_destroy)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9074 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pageid, unsigned int)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9075 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9076 DWNotebook *notebook = handle;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9077 DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9078 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9079
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9080 if(notepage != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9081 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9082 NSMutableArray<DWNotebookPage > views = [notebook views];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9083 NSUInteger index = [views indexOfObject:notepage];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9084
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9085 if(index != NSNotFound)
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9086 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9087 [[notebook tabs] removeSegmentAtIndex:index animated:NO];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9088 [notepage removeFromSuperview];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9089 [views removeObject:notepage];
2693 0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9090 index--;
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9091 if(index >= 0 && index < [views count])
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9092 [[notebook tabs] setSelectedSegmentIndex:index];
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9093 else if([views count] > 0)
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9094 [[notebook tabs] setSelectedSegmentIndex:0];
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9095 [notebook pageChanged:nil];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9096 [notepage release];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9097 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9098 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9099 DW_LOCAL_POOL_OUT;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9100 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9101 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9102
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9103 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9104 * Queries the currently visible page ID.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9105 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9106 * handle: Handle to the notebook widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9107 */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9108 DW_FUNCTION_DEFINITION(dw_notebook_page_get, unsigned long, HWND handle)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9109 DW_FUNCTION_ADD_PARAM1(handle)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9110 DW_FUNCTION_RETURN(dw_notebook_page_get, unsigned long)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9111 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9112 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9113 DWNotebook *notebook = handle;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9114 NSInteger index = [[notebook tabs] selectedSegmentIndex];
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9115 unsigned long retval = 0;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9116
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	9117 if(index != -1)
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9118 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9119 NSMutableArray<DWNotebookPage > views = [notebook views];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9120 DWNotebookPage *notepage = [views objectAtIndex:index];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9121
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9122 retval = [notepage pageid];
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9123 }
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9124 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9125 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9126
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9127 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9128 * Sets the currently visibale page ID.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9129 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9130 * handle: Handle to the notebook widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9131 * pageid: ID of the page to be made visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9132 */
2409 2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9133 DW_FUNCTION_DEFINITION(dw_notebook_page_set, void, HWND handle, unsigned int pageid)
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9134 DW_FUNCTION_ADD_PARAM2(handle, pageid)
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9135 DW_FUNCTION_NO_RETURN(dw_notebook_page_set)
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9136 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pageid, unsigned int)
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9137 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9138 DWNotebook *notebook = handle;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9139 DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9140
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9141 if(notepage != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9142 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9143 NSMutableArray<DWNotebookPage > views = [notebook views];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9144 NSUInteger index = [views indexOfObject:notepage];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9145
2419 65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	9146 if(index != -1)
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	9147 {
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	9148 [[notebook tabs] setSelectedSegmentIndex:index];
2693 0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9149 [notebook pageChanged:nil];
2409 2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9150 }
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9151 }
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9152 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9153 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9154
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9155 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9156 * Sets the text on the specified notebook tab.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9157 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9158 * handle: Notebook handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9159 * pageid: Page ID of the tab to set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9160 * text: Pointer to the text to set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9161 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9162 DW_FUNCTION_DEFINITION(dw_notebook_page_set_text, void, HWND handle, ULONG pageid, const char *text)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9163 DW_FUNCTION_ADD_PARAM3(handle, pageid, text)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9164 DW_FUNCTION_NO_RETURN(dw_notebook_page_set_text)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9165 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, pageid, ULONG, text, const char *)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9166 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9167 DWNotebook *notebook = handle;
2693 0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9168 DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9169
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9170 if(notepage != nil)
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9171 {
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9172 NSMutableArray<DWNotebookPage > views = [notebook views];
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9173 NSUInteger index = [views indexOfObject:notepage];
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9174
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9175 if(index != -1)
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9176 [[notebook tabs] setTitle:[NSString stringWithUTF8String:text] forSegmentAtIndex:index];
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9177 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9178 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9179 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9180
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9181 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9182 * Sets the text on the specified notebook tab status area.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9183 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9184 * handle: Notebook handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9185 * pageid: Page ID of the tab to set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9186 * text: Pointer to the text to set.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9187 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9188 void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, const char *text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9189 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	9190 /* Not supported here... do nothing */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9191 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9192
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9193 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9194 * Packs the specified box into the notebook page.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9195 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9196 * handle: Handle to the notebook to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9197 * pageid: Page ID in the notebook which is being packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9198 * page: Box handle to be packed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9199 */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9200 DW_FUNCTION_DEFINITION(dw_notebook_pack, void, HWND handle, ULONG pageid, HWND page)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9201 DW_FUNCTION_ADD_PARAM3(handle, pageid, page)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9202 DW_FUNCTION_NO_RETURN(dw_notebook_pack)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9203 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, pageid, ULONG, page, HWND)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9204 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9205 DWNotebook *notebook = handle;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9206 DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9207
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9208 if(notepage != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9209 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9210 dw_box_pack_start(notepage, page, 0, 0, TRUE, TRUE, 0);
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9211 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9212 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9213 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9214
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9215 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9216 * Create a new Window Frame.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9217 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9218 * owner: The Owner's window handle or HWND_DESKTOP.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9219 * title: The Window title.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9220 * flStyle: Style flags, see the PM reference.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9221 */
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9222 DW_FUNCTION_DEFINITION(dw_window_new, HWND, DW_UNUSED(HWND hwndOwner), const char *title, ULONG flStyle)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9223 DW_FUNCTION_ADD_PARAM3(hwndOwner, title, flStyle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9224 DW_FUNCTION_RETURN(dw_window_new, HWND)
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9225 DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(hwndOwner), HWND, title, char *, flStyle, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9226 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9227 DW_FUNCTION_INIT;
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9228 CGRect screenrect = [[UIScreen mainScreen] bounds];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9229 DWWindow *window = [[DWWindow alloc] initWithFrame:screenrect];
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	9230 DWView *view = [[DWView alloc] init];
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	9231 UIUserInterfaceStyle style = [[DWObj hiddenWindow] overrideUserInterfaceStyle];
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9232
2599 32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9233 /* Copy the overrideUserInterfaceStyle property from the hiddenWindow */
32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9234 if(style != UIUserInterfaceStyleUnspecified)
32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9235 [window setOverrideUserInterfaceStyle:style];
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	9236 [window setWindowLevel:UIWindowLevelNormal];
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9237 [window setRootViewController:[[DWViewController alloc] init]];
2409 2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9238 [window setBackgroundColor:[UIColor systemBackgroundColor]];
2599 32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9239 [[[window rootViewController] view] addSubview:view];
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9240 [_dw_toplevel_windows addObject:window];
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9241
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9242 /* Handle style flags... There is no visible frame...
4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9243 * On iOS 13 and higher if a titlebar is requested create a navigation bar.
4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9244 */
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9245 if(@available(iOS 13.0, *)) {
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9246 NSString *nstitle = [NSString stringWithUTF8String:title];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9247 [window setLargeContentTitle:nstitle];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9248 if(flStyle & DW_FCF_TITLEBAR)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9249 {
2570 2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	9250 NSInteger sbheight = [[[window windowScene] statusBarManager] statusBarFrame].size.height;
2674 dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9251 CGRect navrect = CGRectMake(0, sbheight, screenrect.size.width, 44);
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9252 UINavigationBar* navbar = [[UINavigationBar alloc] initWithFrame:navrect];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9253 UINavigationItem* navItem = [[UINavigationItem alloc] initWithTitle:nstitle];
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9254
2674 dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9255 /* Double check the intrinsic height... */
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9256 CGSize navdefault = [navbar intrinsicContentSize];
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9257 if(navdefault.height != navrect.size.height)
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9258 {
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9259 navrect.size.height = navdefault.height;
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9260 navbar.frame = navrect;
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9261 }
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9262
2673 a39e2ea6fa14 iOS: Only add the "Back" button to the Navigation Bar if the window has the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2649 diff changeset	9263 /* We maintain a list of top-level windows...If there is more than one window,
a39e2ea6fa14 iOS: Only add the "Back" button to the Navigation Bar if the window has the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2649 diff changeset	9264 * and our window has the close button style, add a Back button that will close it.
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9265 */
2673 a39e2ea6fa14 iOS: Only add the "Back" button to the Navigation Bar if the window has the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2649 diff changeset	9266 if([_dw_toplevel_windows count] > 1 && flStyle & DW_FCF_CLOSEBUTTON)
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9267 {
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9268 UIBarButtonItem *back = [[UIBarButtonItem alloc] initWithTitle:@"Back"
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9269 style:UIBarButtonItemStylePlain
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9270 target:window
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9271 action:@selector(closeWindow:)];
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9272
2639 0be4b2e21885 iOS: Fix display of the Back button... closing the window seems to cause bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2638 diff changeset	9273 navItem.leftBarButtonItem = back;
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9274 }
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9275 [navbar setItems:@[navItem]];
2599 32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9276 [[[window rootViewController] view] addSubview:navbar];
32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9277 }
32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9278 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9279 DW_FUNCTION_RETURN_THIS(window);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9280 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9281
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9282 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9283 * Call a function from the window (widget)'s context.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9284 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9285 * handle: Window handle of the widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9286 * function: Function pointer to be called.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9287 * data: Pointer to the data to be passed to the function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9288 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9289 void API dw_window_function(HWND handle, void function, void data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9290 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9291 void *params = calloc(2, sizeof(void ));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9292 NSValue *v;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9293 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9294 v = [NSValue valueWithPointer:params];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9295 params[0] = function;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9296 params[1] = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9297 [DWObj performSelectorOnMainThread:@selector(doWindowFunc:) withObject:v waitUntilDone:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9298 free(params);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9299 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9300 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9301
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9302
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9303 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9304 * Changes the appearance of the mouse pointer.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9305 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9306 * handle: Handle to widget for which to change.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9307 * cursortype: ID of the pointer you want.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9308 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9309 void API dw_window_set_pointer(HWND handle, int pointertype)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9310 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9311 /* TODO: Only might be possible on Catalyst */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9312 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9313
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9314 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9315 * Makes the window visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9316 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9317 * handle: The window handle to make visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9318 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9319 DW_FUNCTION_DEFINITION(dw_window_show, int, HWND handle)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9320 DW_FUNCTION_ADD_PARAM1(handle)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9321 DW_FUNCTION_RETURN(dw_window_show, int)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9322 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9323 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9324 NSObject *object = handle;
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9325 int retval = DW_ERROR_NONE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9326
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9327 if([ object isMemberOfClass:[DWWindow class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9328 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9329 DWWindow *window = handle;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9330 CGRect rect = [window frame];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9331
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9332 /* If we haven't been sized by a call.. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9333 if(rect.size.width <= 1 \|\| rect.size.height <= 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9334 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9335 /* Determine the contents size */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9336 dw_window_set_size(handle, 0, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9337 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9338 if(![window shown])
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	9339 {
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	9340 [window makeKeyAndVisible];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9341 [window setShown:YES];
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	9342 }
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9343 else
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9344 [window setHidden:NO];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9345 }
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9346 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9347 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9348
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9349 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9350 * Makes the window invisible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9351 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9352 * handle: The window handle to make visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9353 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9354 DW_FUNCTION_DEFINITION(dw_window_hide, int, HWND handle)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9355 DW_FUNCTION_ADD_PARAM1(handle)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9356 DW_FUNCTION_RETURN(dw_window_hide, int)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9357 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9358 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9359 NSObject *object = handle;
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9360 int retval = DW_ERROR_NONE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9361
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9362 if([ object isKindOfClass:[ UIWindow class ] ])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9363 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9364 UIWindow *window = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9365
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9366 [window setHidden:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9367 }
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9368 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9369 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9370
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9371 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9372 * Sets the colors used by a specified window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9373 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9374 * handle: The window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9375 * fore: Foreground color in DW_RGB format or a default color index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9376 * back: Background color in DW_RGB format or a default color index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9377 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9378 DW_FUNCTION_DEFINITION(dw_window_set_color, int, HWND handle, unsigned long fore, unsigned long back)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9379 DW_FUNCTION_ADD_PARAM3(handle, fore, back)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9380 DW_FUNCTION_RETURN(dw_window_set_color, int)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9381 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, fore, unsigned long, back, unsigned long)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9382 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9383 id object = handle;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	9384 unsigned long _fore = _dw_get_color(fore);
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	9385 unsigned long _back = _dw_get_color(back);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9386 UIColor *fg = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9387 UIColor *bg = NULL;
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9388 int retval = DW_ERROR_NONE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9389
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9390 /* Get the UIColor for non-default colors */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9391 if(fore != DW_CLR_DEFAULT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9392 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9393 fg = [UIColor colorWithRed: DW_RED_VALUE(_fore)/255.0 green: DW_GREEN_VALUE(_fore)/255.0 blue: DW_BLUE_VALUE(_fore)/255.0 alpha: 1];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9394 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9395 if(back != DW_CLR_DEFAULT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9396 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9397 bg = [UIColor colorWithRed: DW_RED_VALUE(_back)/255.0 green: DW_GREEN_VALUE(_back)/255.0 blue: DW_BLUE_VALUE(_back)/255.0 alpha: 1];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9398 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9399
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9400 /* Get the textfield from the spinbutton */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9401 if([object isMemberOfClass:[DWSpinButton class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9402 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9403 object = [object textfield];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9404 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9405 /* Get the cell on classes using NSCell */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9406 if([object isKindOfClass:[UITextField class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9407 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9408 [object setTextColor:(fg ? fg : [UIColor labelColor])];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9409 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9410 if([object isMemberOfClass:[DWButton class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9411 {
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	9412 [[object titleLabel] setTextColor:(fg ? fg : [UIColor labelColor])];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9413 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9414 if([object isKindOfClass:[UITextField class]] \|\| [object isKindOfClass:[UIButton class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9415 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9416 [object setBackgroundColor:(bg ? bg : [UIColor systemBackgroundColor])];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9417 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9418 else if([object isMemberOfClass:[DWBox class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9419 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9420 DWBox *box = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9421
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9422 [box setBackgroundColor:bg];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9423 }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9424 else if([object isKindOfClass:[UITableView class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9425 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9426 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9427
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9428 [cont setBackgroundColor:(bg ? bg : [UIColor systemBackgroundColor])];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9429 [cont setForegroundColor:(fg ? fg : [UIColor labelColor])];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9430 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9431 else if([object isMemberOfClass:[DWMLE class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9432 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9433 DWMLE *mle = handle;
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9434 [mle setBackgroundColor:(bg ? bg : [UIColor systemBackgroundColor])];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9435 [mle setTextColor:(fg ? fg : [UIColor labelColor])];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9436 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9437 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9438 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9439
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9440 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9441 * Sets the font used by a specified window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9442 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9443 * handle: The window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9444 * border: Size of the window border in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9445 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9446 int API dw_window_set_border(HWND handle, int border)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9447 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	9448 /* No overlapping windows on iOS, unsupported */
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	9449 return DW_ERROR_UNKNOWN;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9450 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9451
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9452 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9453 * Sets the style of a given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9454 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9455 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9456 * width: New width in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9457 * height: New height in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9458 */
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9459 DW_FUNCTION_DEFINITION(dw_window_set_style, void, HWND handle, ULONG style, ULONG mask)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9460 DW_FUNCTION_ADD_PARAM3(handle, style, mask)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9461 DW_FUNCTION_NO_RETURN(dw_window_set_style)
1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9462 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, style, ULONG, mask, ULONG)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9463 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9464 id object = _dw_text_handle(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9465
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9466 if([object isKindOfClass:[UILabel class]])
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9467 {
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9468 UILabel *label = object;
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9469
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9470 [label setTextAlignment:(style & 0xF)];
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9471 if(mask & DW_DT_VCENTER)
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	9472 [label setBaselineAdjustment:(style & DW_DT_VCENTER ? UIBaselineAdjustmentAlignCenters : UIBaselineAdjustmentNone)];
2378 cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9473 if(mask & DW_DT_WORDBREAK)
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9474 {
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9475 if(style & DW_DT_WORDBREAK)
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9476 [label setLineBreakMode:NSLineBreakByWordWrapping];
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9477 else
cc858be0cb81 iOS: More work on conversion from Mac... going to be a few more of these bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2377 diff changeset	9478 [label setLineBreakMode:NSLineBreakByTruncatingTail];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9479 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9480 }
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9481 else if([object isMemberOfClass:[DWMLE class]])
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9482 {
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9483 DWMLE *mle = handle;
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9484 [mle setTextAlignment:(style & mask)];
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9485 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9486 else if([object isMemberOfClass:[DWMenuItem class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9487 {
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9488 DWMenuItem *menuitem = object;
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	9489 UIMenuElementState oldstate = [menuitem state];
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	9490 BOOL oldenabled = [menuitem enabled];
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9491
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9492 if(mask & (DW_MIS_CHECKED \| DW_MIS_UNCHECKED))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9493 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9494 if(style & DW_MIS_CHECKED)
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9495 [menuitem setState:UIMenuElementStateOn];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9496 else if(style & DW_MIS_UNCHECKED)
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9497 [menuitem setState:UIMenuElementStateOff];
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9498 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9499 if(mask & (DW_MIS_ENABLED \| DW_MIS_DISABLED))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9500 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9501 if(style & DW_MIS_ENABLED)
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9502 [menuitem setEnabled:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9503 else if(style & DW_MIS_DISABLED)
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9504 [menuitem setEnabled:NO];
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9505 }
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	9506 /* Only force the menus to repopulate if something changed */
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	9507 if(oldstate != [menuitem state] \|\| oldenabled != [menuitem enabled])
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9508 [DWObj safeCall:@selector(updateMenu:) withObject:nil];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9509 }
2399 1cbc316292c1 iOS: Move more functions into thread safety, iOS is very adamant about the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2396 diff changeset	9510 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9511 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9512
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9513 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9514 * Sets the current focus item for a window/dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9515 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9516 * handle: Handle to the dialog item to be focused.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9517 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9518 * This is for use after showing the window/dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9519 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9520 DW_FUNCTION_DEFINITION(dw_window_set_focus, void, HWND handle)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9521 DW_FUNCTION_ADD_PARAM1(handle)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9522 DW_FUNCTION_NO_RETURN(dw_window_set_focus)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9523 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9524 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9525 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9526
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9527 [object becomeFirstResponder];
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9528 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9529 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9530
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9531 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9532 * Sets the default focus item for a window/dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9533 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9534 * window: Toplevel window or dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9535 * defaultitem: Handle to the dialog item to be default.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9536 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9537 * This is for use before showing the window/dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9538 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9539 DW_FUNCTION_DEFINITION(dw_window_default, void, HWND handle, HWND defaultitem)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9540 DW_FUNCTION_ADD_PARAM2(handle, defaultitem)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9541 DW_FUNCTION_NO_RETURN(dw_window_default)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9542 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, defaultitem, HWND)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9543 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9544 DWWindow *window = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9545 id object = defaultitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9546
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9547 if([window isKindOfClass:[UIWindow class]] && [object isKindOfClass:[UIControl class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9548 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9549 [object becomeFirstResponder];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9550 }
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9551 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9552 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9553
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9554 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9555 * Sets window to click the default dialog item when an ENTER is pressed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9556 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9557 * window: Window (widget) to look for the ENTER press.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9558 * next: Window (widget) to move to next (or click)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9559 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9560 void API dw_window_click_default(HWND handle, HWND next)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9561 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9562 /* TODO: Figure out how to do this if we should */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9563 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9564
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9565 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9566 * Captures the mouse input to this window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9567 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9568 * handle: Handle to receive mouse input.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9569 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9570 void API dw_window_capture(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9571 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9572 /* Don't do anything for now */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9573 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9574
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9575 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9576 * Releases previous mouse capture.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9577 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9578 void API dw_window_release(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9579 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9580 /* Don't do anything for now */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9581 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9582
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9583 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9584 * Changes a window's parent to newparent.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9585 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9586 * handle: The window handle to destroy.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9587 * newparent: The window's new parent window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9588 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9589 void API dw_window_reparent(HWND handle, HWND newparent)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9590 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9591 /* TODO: Not sure if we should even bother with this */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9592 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9593
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9594 /* Allows the user to choose a font using the system's font chooser dialog.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9596 * currfont: current font
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9597 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9598 * A malloced buffer with the selected font or NULL on error.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9599 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9600 char * API dw_font_choose(const char *currfont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9601 {
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9602 NSPointerArray *params = [[NSPointerArray pointerArrayWithOptions:NSPointerFunctionsOpaqueMemory] retain];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9603 char *font = NULL;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9604
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9605 [params addPointer:(void *)currfont];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9606 [DWObj safeCall:@selector(fontPicker:) withObject:params];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9607 if([params count] > 1)
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9608 font = [params pointerAtIndex:1];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9609
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9610 return font;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9611 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9612
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9613 /* Internal function to return a pointer to an item struct
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9614 * with information about the packing information regarding object.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9615 */
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9616 Item *_dw_box_item(id object)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9617 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9618 /* Find the item within the box it is packed into */
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9619 if([object isKindOfClass:[DWBox class]] \|\| [object isKindOfClass:[UIControl class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9620 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9621 DWBox parent = (DWBox )[object superview];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9622
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9623 if([parent isKindOfClass:[DWBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9624 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9625 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9626 Item *thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9627 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9628
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9629 for(z=0;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9630 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9631 if(thisitem[z].hwnd == object)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9632 return &thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9633 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9634 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9635 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9636 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9637 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9638
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9639 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9640 * Sets the font used by a specified window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9641 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9642 * handle: The window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9643 * fontname: Name and size of the font in the form "size.fontname"
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9644 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9645 int API dw_window_set_font(HWND handle, const char *fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9646 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9647 UIFont *font = fontname ? _dw_font_by_name(fontname) :
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9648 (DWDefaultFont ? DWDefaultFont : [UIFont systemFontOfSize:[UIFont smallSystemFontSize]]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9649
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9650 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9651 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9652 id object = _dw_text_handle(handle);
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9653 if([object isMemberOfClass:[DWMLE class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9654 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9655 DWMLE *mle = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9656
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9657 [mle setFont:font];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9658 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9659 else if([object isKindOfClass:[UIControl class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9660 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9661 [object setFont:font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9662 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9663 else if([object isMemberOfClass:[DWRender class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9664 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9665 DWRender *render = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9666
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9667 [render setFont:font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9668 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9669 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9670 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9671 /* If we changed the text... */
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9672 Item *item = _dw_box_item(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9673
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9674 /* Check to see if any of the sizes need to be recalculated */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9675 if(item && (item->origwidth == DW_SIZE_AUTO \|\| item->origheight == DW_SIZE_AUTO))
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9676 {
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9677 _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9678 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9679 _dw_redraw([object window], TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9680 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9681 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9682 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9683 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9684 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9685
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9686 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9687 * Returns the current font for the specified window
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9688 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9689 * handle: The window handle from which to obtain the font.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9690 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9691 char * API dw_window_get_font(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9692 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9693 id object = _dw_text_handle(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9694 UIFont *font = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9695
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9696 if([object isKindOfClass:[UIControl class]] \|\| [object isMemberOfClass:[DWRender class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9697 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9698 font = [object font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9699 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9700 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9701 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9702 NSString *fontname = [font fontName];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9703 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9704 return strdup([output UTF8String]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9705 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9706 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9707 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9708
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9709 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9710 * Destroys a window and all of it's children.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9711 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9712 * handle: The window handle to destroy.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9713 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9714 DW_FUNCTION_DEFINITION(dw_window_destroy, int, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9715 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9716 DW_FUNCTION_RETURN(dw_window_destroy, int)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9717 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9718 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9719 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9720 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9721 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9722 int retval = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9723
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9724 /* Handle destroying a top-level window */
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9725 if([object isKindOfClass:[UIWindow class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9726 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9727 DWWindow *window = handle;
2640 cee87daaf150 iOS: New method of removing DWWindow from the hierarchy. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2639 diff changeset	9728 [window setHidden:YES];
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9729 [_dw_toplevel_windows removeObject:window];
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9730 for(id object in [[[window rootViewController] view] subviews])
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9731 {
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9732 [object removeFromSuperview];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9733 [object release];
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9734 }
2640 cee87daaf150 iOS: New method of removing DWWindow from the hierarchy. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2639 diff changeset	9735 [[[window rootViewController] view] removeFromSuperview];
cee87daaf150 iOS: New method of removing DWWindow from the hierarchy. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2639 diff changeset	9736 [window setRootViewController:nil];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9737 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9738 /* Handle removing menu items from menus */
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	9739 else if([object isMemberOfClass:[DWMenuItem class]])
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	9740 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	9741 DWMenuItem *item = object;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	9742 DWMenu *menu = [item menu];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9743
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9744 [menu removeItem:object];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9745 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9746 /* Handle destroying a control or box */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9747 else if([object isKindOfClass:[UIView class]] \|\| [object isKindOfClass:[UIControl class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9748 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9749 DWBox parent = (DWBox )[object superview];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9750
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9751 if([parent isKindOfClass:[DWBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9752 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9753 id window = [object window];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9754 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9755 int z, index = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9756 Item tmpitem = NULL, thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9757
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9758 if(!thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9759 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9760
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9761 for(z=0;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9762 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9763 if(thisitem[z].hwnd == object)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9764 index = z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9765 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9766
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9767 if(index != -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9768 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9769 [object removeFromSuperview];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	9770 [object release];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9771
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9772 if(thisbox->count > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9773 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9774 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9775
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9776 /* Copy all but the current entry to the new list */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9777 for(z=0;z<index;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9778 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9779 tmpitem[z] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9780 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9781 for(z=index+1;z<thisbox->count;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9782 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9783 tmpitem[z-1] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9784 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9785 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9786
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9787 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9788 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9789 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9790 if(tmpitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9791 thisbox->count--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9792 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9793 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9794
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9795 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9796 _dw_redraw(window, TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9797 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9798 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9799 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9800 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9801 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9802 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9803
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9804 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9805 * Gets the text used for a given window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9806 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9807 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9808 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9809 * text: The text associsated with a given window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9810 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9811 DW_FUNCTION_DEFINITION(dw_window_get_text, char *, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9812 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9813 DW_FUNCTION_RETURN(dw_window_get_text, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9814 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9815 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9816 DW_FUNCTION_INIT;
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9817 id object = _dw_text_handle(handle);
2589 e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9818 id control = handle;
2792 9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9819 NSString *nsstr = nil;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9820 char *retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9821
2589 e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9822 if([control isKindOfClass:[UIButton class]])
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9823 {
2792 9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9824 nsstr = [control titleForState:UIControlStateNormal];
2589 e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9825 }
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9826 else if([object isKindOfClass:[UILabel class]] \|\| [object isKindOfClass:[UITextField class]])
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	9827 {
2792 9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9828 nsstr = [object text];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9829 }
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9830 else if([object isMemberOfClass:[DWWindow class]])
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9831 {
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9832 DWWindow *window = object;
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9833 UIView *view = [[window rootViewController] view];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9834 NSArray *array = [view subviews];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9835
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9836 for(id obj in array)
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9837 {
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9838 if([obj isMemberOfClass:[UINavigationBar class]])
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9839 {
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9840 UINavigationBar *nav = obj;
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9841 UINavigationItem *item = [[nav items] firstObject];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9842
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9843 nsstr = [item title];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9844 }
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9845 }
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9846 }
2820 b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9847 if(nsstr)
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	9848 retval = strdup([nsstr UTF8String]);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9849 DW_FUNCTION_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9850 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9851
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9852 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9853 * Sets the text used for a given window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9854 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9855 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9856 * text: The text associsated with a given window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9857 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9858 DW_FUNCTION_DEFINITION(dw_window_set_text, void, HWND handle, const char *text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9859 DW_FUNCTION_ADD_PARAM2(handle, text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9860 DW_FUNCTION_NO_RETURN(dw_window_set_text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9861 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9862 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9863 DW_FUNCTION_INIT;
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9864 id object = _dw_text_handle(handle);
2589 e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9865 id control = handle;
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9866 Item *item = NULL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9867
2589 e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9868 if([control isKindOfClass:[UIButton class]])
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9869 {
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9870 [control setTitle:[NSString stringWithUTF8String:text] forState:UIControlStateNormal];
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9871 item = _dw_box_item(handle);
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9872 }
e879afecf3ab iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2588 diff changeset	9873 else if([object isKindOfClass:[UILabel class]] \|\| [object isKindOfClass:[UITextField class]])
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9874 {
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	9875 [object setText:[NSString stringWithUTF8String:text]];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9876 item = _dw_box_item(handle);
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9877 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9878 else if([object isMemberOfClass:[DWWindow class]])
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9879 {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9880 DWWindow *window = object;
2791 b62859fbd9a3 iOS: Fix dw_window_set_text() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2787 diff changeset	9881 UIView *view = [[window rootViewController] view];
b62859fbd9a3 iOS: Fix dw_window_set_text() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2787 diff changeset	9882 NSArray *array = [view subviews];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9883 NSString *nstr = [NSString stringWithUTF8String:text];
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9884
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9885 [window setLargeContentTitle:nstr];
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9886
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9887 for(id obj in array)
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9888 {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9889 if([obj isMemberOfClass:[UINavigationBar class]])
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9890 {
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9891 UINavigationBar *nav = obj;
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9892 UINavigationItem *item = [[nav items] firstObject];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9893
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9894 [item setTitle:nstr];
2569 97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9895 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9896 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9897 }
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9898 /* If we changed the text...
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9899 * Check to see if any of the sizes need to be recalculated
97b30df25fd1 iOS: If DW_FCF_TITLEBAR is passed to dw_window_new() create a UINavigationBar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	9900 */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9901 if(item && (item->origwidth == DW_SIZE_AUTO \|\| item->origheight == DW_SIZE_AUTO))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9902 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9903 int newwidth, newheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9904
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9905 _dw_control_size(handle, &newwidth, &newheight);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9906
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9907 /* Only update the item and redraw the window if it changed */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9908 if((item->origwidth == DW_SIZE_AUTO && item->width != newwidth) \|\|
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9909 (item->origheight == DW_SIZE_AUTO && item->height != newheight))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9910 {
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9911 if(item->origwidth == DW_SIZE_AUTO)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9912 item->width = newwidth;
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9913 if(item->origheight == DW_SIZE_AUTO)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9914 item->height = newheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9915 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9916 _dw_redraw([object window], TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9917 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9918 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9919 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9920 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9921
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9922 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9923 * Sets the text used for a given window's floating bubble help.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9924 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9925 * handle: Handle to the window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9926 * bubbletext: The text in the floating bubble tooltip.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9927 */
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9928 void API dw_window_set_tooltip(HWND handle, const char *bubbletext)
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9929 {
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9930 /* Tooltips don't exist on iOS */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9931 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9932
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9933 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9934 * Disables given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9935 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9936 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9937 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9938 DW_FUNCTION_DEFINITION(dw_window_disable, void, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9939 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9940 DW_FUNCTION_NO_RETURN(dw_window_disable)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9941 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9942 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9943 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9944 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9945
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9946 if([object isMemberOfClass:[UIScrollView class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9947 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9948 UIScrollView *sv = handle;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9949 NSArray *subviews = [sv subviews];
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9950 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9951 }
2464 4fba0b9453ee iOS: Fix calculating label size when there is no text. Use "gT" to calculate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2463 diff changeset	9952 if([object isKindOfClass:[UIControl class]] \|\| [object isMemberOfClass:[DWMenuItem class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9953 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9954 [object setEnabled:NO];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9955 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9956 if([object isKindOfClass:[UITextView class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9957 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9958 UITextView *mle = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9959
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9960 [mle setEditable:NO];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9961 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9962 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9963 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9964
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9965 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9966 * Enables given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9967 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9968 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9969 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9970 DW_FUNCTION_DEFINITION(dw_window_enable, void, HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9971 DW_FUNCTION_ADD_PARAM1(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9972 DW_FUNCTION_NO_RETURN(dw_window_enable)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9973 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9974 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9975 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9976 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9977
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9978 if([object isMemberOfClass:[UIScrollView class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9979 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9980 UIScrollView *sv = handle;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9981 NSArray *subviews = [sv subviews];
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9982 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9983 }
2464 4fba0b9453ee iOS: Fix calculating label size when there is no text. Use "gT" to calculate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2463 diff changeset	9984 if([object isKindOfClass:[UIControl class]] \|\| [object isMemberOfClass:[DWMenuItem class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9985 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9986 [object setEnabled:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9987 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9988 if([object isKindOfClass:[UITextView class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9989 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9990 UITextView *mle = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9991
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9992 [mle setEditable:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9993 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9994 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9995 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9996
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9997 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9998 * Sets the bitmap used for a given static window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9999 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10000 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10001 * id: An ID to be used to specify the icon,
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10002 * (pass 0 if you use the filename param)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10003 * filename: a path to a file (Bitmap on OS/2 or
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10004 * Windows and a pixmap on Unix, pass
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10005 * NULL if you use the id param)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10006 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10007 void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, const char *data, int len)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10008 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10009 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10010
2450 2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10011 if([object isKindOfClass:[UIImageView class]] \|\| [object isMemberOfClass:[DWButton class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10012 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10013 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10014 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10015 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10016 NSData *thisdata = [NSData dataWithBytes:data length:len];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	10017 UIImage *pixmap = [[UIImage alloc] initWithData:thisdata];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10018
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10019 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10020 {
2450 2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10021 if([object isMemberOfClass:[DWButton class]])
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10022 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10023 DWButton *button = object;
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10024 [button setImage:pixmap forState:UIControlStateNormal];
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10025 }
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10026 else
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10027 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10028 UIImageView *iv = object;
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10029 [iv setImage:pixmap];
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10030 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10031 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10032 /* If we changed the bitmap... */
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	10033 Item *item = _dw_box_item(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10034
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10035 /* Check to see if any of the sizes need to be recalculated */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	10036 if(item && (item->origwidth == DW_SIZE_AUTO \|\| item->origheight == DW_SIZE_AUTO))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10037 {
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	10038 _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10039 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10040 _dw_redraw([object window], TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10041 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10042 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10043 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10044 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10045 dw_window_set_bitmap(handle, cid, NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10046 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10047 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10048
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10049 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10050 * Sets the bitmap used for a given static window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10051 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10052 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10053 * id: An ID to be used to specify the icon,
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10054 * (pass 0 if you use the filename param)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10055 * filename: a path to a file (Bitmap on OS/2 or
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10056 * Windows and a pixmap on Unix, pass
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10057 * NULL if you use the id param)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10058 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10059 void API dw_window_set_bitmap(HWND handle, unsigned long resid, const char *filename)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10060 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10061 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10062 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10063
2450 2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10064 if([object isKindOfClass:[UIImageView class]] \|\| [object isMemberOfClass:[DWButton class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10065 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10066 UIImage *bitmap = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10067
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10068 if(filename)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10069 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10070 char *ext = _dw_get_image_extension( filename );
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10071 NSString *nstr = [ NSString stringWithUTF8String:filename ];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10072
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	10073 bitmap = [[UIImage alloc] initWithContentsOfFile:nstr];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10074
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10075 if(!bitmap && ext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10076 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10077 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	10078 bitmap = [[UIImage alloc] initWithContentsOfFile:nstr];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10079 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10080 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10081 if(!bitmap && resid > 0 && resid < 65536)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10082 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10083 bitmap = _dw_icon_load(resid);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10084 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10085
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10086 if(bitmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10087 {
2450 2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10088 if([object isMemberOfClass:[DWButton class]])
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10089 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10090 DWButton *button = object;
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10091 [button setImage:bitmap forState:UIControlStateNormal];
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10092 }
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10093 else
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10094 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10095 UIImageView *iv = object;
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10096 [iv setImage:bitmap];
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10097 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10098
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10099 /* If we changed the bitmap... */
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	10100 Item *item = _dw_box_item(handle);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10101
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10102 /* Check to see if any of the sizes need to be recalculated */
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	10103 if(item && (item->origwidth == DW_SIZE_AUTO \|\| item->origheight == DW_SIZE_AUTO))
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10104 {
2740 9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	10105 _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10106 /* Queue a redraw on the top-level window */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10107 _dw_redraw([object window], TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10108 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10109 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10110 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10111 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10112 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10113
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10114 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10115 * Sets the icon used for a given window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10116 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10117 * handle: Handle to the window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10118 * id: An ID to be used to specify the icon.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10119 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10120 void API dw_window_set_icon(HWND handle, HICN icon)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10121 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10122 /* This isn't needed, it is loaded from the bundle */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10123 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10124
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10125 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10126 * Gets the child window handle with specified ID.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10127 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10128 * handle: Handle to the parent window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10129 * id: Integer ID of the child.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10130 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10131 HWND API dw_window_from_id(HWND handle, int cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10132 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10133 NSObject *object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10134 UIView *view = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10135 if([ object isKindOfClass:[ UIWindow class ] ])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10136 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10137 UIWindow *window = handle;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10138 NSArray *subviews = [window subviews];
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10139 view = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10140 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10141 return [view viewWithTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10142 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10143
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10144 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10145 * Minimizes or Iconifies a top-level window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10146 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10147 * handle: The window handle to minimize.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10148 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10149 int API dw_window_minimize(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10150 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10151 /* TODO: Not sure if we should do anything here on iOS */
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10152 return DW_ERROR_GENERAL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10153 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10154
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10155 /* Causes entire window to be invalidated and redrawn.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10156 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10157 * handle: Toplevel window handle to be redrawn.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10158 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10159 void API dw_window_redraw(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10160 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10161 DWWindow *window = handle;
2793 24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10162 NSArray *array = [[[window rootViewController] view] subviews];
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10163
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10164 for(id obj in array)
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10165 {
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10166 if([obj isMemberOfClass:[DWView class]])
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10167 {
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10168 DWView *view = obj;
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10169 [view showWindow];
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10170 }
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10171 }
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10172
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10173 [window setShown:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10174 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10175
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10176 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10177 * Makes the window topmost.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10178 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10179 * handle: The window handle to make topmost.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10180 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10181 int API dw_window_raise(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10182 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10183 /* TODO: Not sure if we should do anything here on iOS */
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10184 return DW_ERROR_GENERAL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10185 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10186
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10187 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10188 * Makes the window bottommost.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10189 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10190 * handle: The window handle to make bottommost.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10191 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10192 int API dw_window_lower(HWND handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10193 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10194 /* TODO: Not sure if we should do anything here on iOS */
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10195 return DW_ERROR_GENERAL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10196 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10197
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10198 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10199 * Sets the size of a given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10200 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10201 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10202 * width: New width in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10203 * height: New height in pixels.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10204 */
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10205 void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10206 {
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10207 /* On iOS the window usually takes up the full screen */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10208 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10209
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10210 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10211 * Gets the size the system thinks the widget should be.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10212 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10213 * handle: Window handle of the item to be back.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10214 * width: Width in pixels of the item or NULL if not needed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10215 * height: Height in pixels of the item or NULL if not needed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10216 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10217 void API dw_window_get_preferred_size(HWND handle, int width, int height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10218 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10219 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10220
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10221 if([object isMemberOfClass:[DWBox class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10222 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10223 Box *thisbox;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10224
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10225 if((thisbox = (Box *)[object box]))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10226 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10227 int depth = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10228
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10229 /* Calculate space requirements */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10230 _dw_resize_box(thisbox, &depth, 0, 0, 1);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10231
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10232 /* Return what was requested */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10233 if(width) *width = thisbox->minwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10234 if(height) *height = thisbox->minheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10235 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10236 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10237 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10238 _dw_control_size(handle, width, height);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10239 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10240
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10241 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10242 * Sets the gravity of a given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10243 * Gravity controls which corner of the screen and window the position is relative to.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10244 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10245 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10246 * horz: DW_GRAV_LEFT (default), DW_GRAV_RIGHT or DW_GRAV_CENTER.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10247 * vert: DW_GRAV_TOP (default), DW_GRAV_BOTTOM or DW_GRAV_CENTER.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10248 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10249 void API dw_window_set_gravity(HWND handle, int horz, int vert)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10250 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10251 dw_window_set_data(handle, "_dw_grav_horz", DW_INT_TO_POINTER(horz));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10252 dw_window_set_data(handle, "_dw_grav_vert", DW_INT_TO_POINTER(vert));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10253 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10254
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10255 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10256 * Sets the position of a given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10257 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10258 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10259 * x: X location from the bottom left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10260 * y: Y location from the bottom left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10261 */
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10262 void API dw_window_set_pos(HWND handle, LONG x, LONG y)
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10263 {
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10264 /* iOS windows take up the whole screen */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10265 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10266
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10267 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10268 * Sets the position and size of a given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10269 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10270 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10271 * x: X location from the bottom left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10272 * y: Y location from the bottom left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10273 * width: Width of the widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10274 * height: Height of the widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10275 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10276 void API dw_window_set_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10277 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10278 /* iOS windows take up the whole screen */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10279 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10280
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10281 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10282 * Gets the position and size of a given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10283 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10284 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10285 * x: X location from the bottom left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10286 * y: Y location from the bottom left.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10287 * width: Width of the widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10288 * height: Height of the widget.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10289 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10290 void API dw_window_get_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10291 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10292 NSObject *object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10293
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2541 diff changeset	10294 if([object isKindOfClass:[UIWindow class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10295 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10296 UIWindow *window = handle;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	10297 CGRect rect = [window frame];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10298 if(x)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10299 *x = rect.origin.x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10300 if(y)
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10301 *y = rect.origin.y;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10302 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10303 *width = rect.size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10304 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10305 *height = rect.size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10306 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10307 }
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2541 diff changeset	10308 else if([object isKindOfClass:[UIControl class]])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10309 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10310 UIControl *control = handle;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	10311 CGRect rect = [control frame];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10312 if(x)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10313 *x = rect.origin.x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10314 if(y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10315 *y = rect.origin.y;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10316 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10317 *width = rect.size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10318 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10319 *height = rect.size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10320 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10321 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10322 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10323
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10324 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10325 * Returns the width of the screen.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10326 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10327 int API dw_screen_width(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10328 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10329 CGRect screenRect = [[UIScreen mainScreen] bounds];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10330 return screenRect.size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10332
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10333 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10334 * Returns the height of the screen.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10335 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10336 int API dw_screen_height(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10337 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10338 CGRect screenRect = [[UIScreen mainScreen] bounds];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10339 return screenRect.size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10340 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10341
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10342 /* This should return the current color depth */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10343 unsigned long API dw_color_depth_get(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10344 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10345 /* iOS always runs in 32bit depth */
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10346 return 32;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10347 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10348
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10349 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10350 * Creates a new system notification if possible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10351 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10352 * title: The short title of the notification.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10353 * imagepath: Path to an image to display or NULL if none.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10354 * description: A longer description of the notification,
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10355 * or NULL if none is necessary.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10356 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10357 * A handle to the notification which can be used to attach a "clicked" event if desired,
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10358 * or NULL if it fails or notifications are not supported by the system.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10359 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10360 * This will create a system notification that will show in the notifaction panel
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10361 * on supported systems, which may be clicked to perform another task.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10362 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10363 HWND dw_notification_new(const char title, const char imagepath, const char *description, ...)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10364 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10365 char outbuf[1025] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10366 HWND retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10368 if(description)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10369 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10370 va_list args;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10371
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10372 va_start(args, description);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10373 vsnprintf(outbuf, 1024, description, args);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10374 va_end(args);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10375 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10376
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10377 /* Configure the notification's payload. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10378 if (@available(iOS 10.0, *))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10379 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10380 if([[NSBundle mainBundle] bundleIdentifier] != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10381 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10382 UNMutableNotificationContent* notification = [[UNMutableNotificationContent alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10383
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10384 if(notification)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10385 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10386 notification.title = [NSString stringWithUTF8String:title];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10387 if(description)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10388 notification.body = [NSString stringWithUTF8String:outbuf];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10389 if(imagepath)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10390 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10391 NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:imagepath]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10392 NSError *error;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10393 UNNotificationAttachment *attachment = [UNNotificationAttachment attachmentWithIdentifier:@"imageID"
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10394 URL:url
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10395 options:nil
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10396 error:&error];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10397 if(attachment)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10398 notification.attachments = @[attachment];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10400 retval = notification;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10401 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10402 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10403 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10404 return retval;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10405 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10406
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10407 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10408 * Sends a notification created by dw_notification_new() after attaching signal handler.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10409 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 * notification: The handle to the notification returned by dw_notification_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10411 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10412 * DW_ERROR_NONE on success, DW_ERROR_UNKNOWN on error or not supported.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10413 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10414 int dw_notification_send(HWND notification)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10416 if(notification)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10418 NSString *notid = [NSString stringWithFormat:@"dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification)];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10419
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10420 /* Schedule the notification. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10421 if (@available(iOS 10.0, *))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10422 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10423 if([[NSBundle mainBundle] bundleIdentifier] != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10424 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10425 UNMutableNotificationContent* content = (UNMutableNotificationContent *)notification;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10426 UNNotificationRequest* request = [UNNotificationRequest requestWithIdentifier:notid content:content trigger:nil];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10427
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10428 UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10429 [center addNotificationRequest:request withCompletionHandler:nil];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10430 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10431 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10432 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10433 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10434 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10435 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10436
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10437
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10438 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10439 * Returns some information about the current operating environment.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10440 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10441 * env: Pointer to a DWEnv struct.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10442 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10443 void dw_environment_query(DWEnv *env)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10444 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10445 memset(env, '\0', sizeof(DWEnv));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10446 strcpy(env->osName, "iOS");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10447
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10448 strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10449 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2541 diff changeset	10450 strncpy(env->htmlEngine, "WEBKIT", sizeof(env->htmlEngine)-1);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10451 env->DWMajorVersion = DW_MAJOR_VERSION;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10452 env->DWMinorVersion = DW_MINOR_VERSION;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10453 #ifdef VER_REV
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10454 env->DWSubVersion = VER_REV;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10455 #else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10456 env->DWSubVersion = DW_SUB_VERSION;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10457 #endif
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10458
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10459 env->MajorVersion = DWOSMajor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10460 env->MinorVersion = DWOSMinor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10461 env->MajorBuild = DWOSBuild;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10462 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10463
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10464 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10465 * Emits a beep.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10466 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10467 * freq: Frequency.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10468 * dur: Duration.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10469 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10470 void API dw_beep(int freq, int dur)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10471 {
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10472 AudioServicesPlayAlertSound((SystemSoundID)1104);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10473 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10474
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10475 /* Call this after drawing to the screen to make sure
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10476 * anything you have drawn is visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10477 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10478 void API dw_flush(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10479 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10480 /* This may need to be thread specific */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10481 [DWObj performSelectorOnMainThread:@selector(doFlush:) withObject:nil waitUntilDone:NO];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10482 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10483
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10484 /* Functions for managing the user data lists that are associated with
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10485 * a given window handle. Used in dw_window_set_data() and
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10486 * dw_window_get_data().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10487 */
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10488 UserData _dw_find_userdata(UserData root, const char varname)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10489 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10490 UserData tmp = root;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10491
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10492 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10493 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10494 if(strcasecmp(tmp->varname, varname) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10495 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10496 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10497 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10498 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10499 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10500
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10501 int _dw_new_userdata(UserData *root, const char varname, void *data)
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10502 {
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10503 UserData *new = _dw_find_userdata(root, varname);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10504
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10505 if(new)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10506 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10507 new->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10508 return TRUE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10509 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10510 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10511 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10512 new = malloc(sizeof(UserData));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10513 if(new)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10514 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10515 new->varname = strdup(varname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10516 new->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10517
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10518 new->next = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10519
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10520 if (!*root)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10521 *root = new;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10522 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10523 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10524 UserData prev = root, *tmp = prev->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10525
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10526 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10527 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10528 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10529 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10530 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10531 prev->next = new;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10532 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10533 return TRUE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10534 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10535 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10536 return FALSE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10537 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10538
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10539 int _dw_remove_userdata(UserData *root, const char varname, int all)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10540 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10541 UserData prev = NULL, tmp = *root;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10542
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10543 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10544 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10545 if(all \|\| strcasecmp(tmp->varname, varname) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10546 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10547 if(!prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10548 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10549 *root = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10550 free(tmp->varname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10551 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10552 if(!all)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10553 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10554 tmp = *root;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10555 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10556 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10557 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10558 /* If all is true we should
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10559 * never get here.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10560 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10561 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10562 free(tmp->varname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10563 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10564 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10565 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10566 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10567 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10568 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10569 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10570 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10571 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10572 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10573 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10574 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10575
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10576 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10577 * Add a named user data item to a window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10578 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10579 * window: Window handle of signal to be called back.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10580 * dataname: A string pointer identifying which signal to be hooked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10581 * data: User data to be passed to the handler function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10582 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10583 DW_FUNCTION_DEFINITION(dw_window_set_data, void, HWND window, const char dataname, void data)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10584 DW_FUNCTION_ADD_PARAM3(window, dataname, data)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10585 DW_FUNCTION_NO_RETURN(dw_window_set_data)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10586 DW_FUNCTION_RESTORE_PARAM3(window, HWND, dataname, const char , data, void )
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10587 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10588 id object = window;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10589 if([object isMemberOfClass:[DWWindow class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10590 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10591 UIWindow *win = window;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10592 NSArray *subviews = [win subviews];
2739 02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10593 for(id obj in subviews)
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10594 {
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10595 if([obj isMemberOfClass:[DWView class]])
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10596 {
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10597 object = obj;
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10598 break;
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10599 }
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10600 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10601 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10602 else if([object isMemberOfClass:[UIScrollView class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10603 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10604 UIScrollView *sv = window;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10605 NSArray *subviews = [sv subviews];
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10606 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10607 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10608 WindowData blah = (WindowData )[object userdata];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10609
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 if(!blah)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10611 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10612 if(!dataname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10614
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10615 blah = calloc(1, sizeof(WindowData));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10616 [object setUserdata:blah];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10617 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10618
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10619 if(data)
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10620 _dw_new_userdata(&(blah->root), dataname, data);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10621 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10622 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10623 if(dataname)
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10624 _dw_remove_userdata(&(blah->root), dataname, FALSE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10625 else
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10626 _dw_remove_userdata(&(blah->root), NULL, TRUE);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10627 }
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10628 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10629 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10630
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10631 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10632 * Gets a named user data item to a window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10633 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10634 * window: Window handle of signal to be called back.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10635 * dataname: A string pointer identifying which signal to be hooked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10636 * data: User data to be passed to the handler function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10637 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10638 DW_FUNCTION_DEFINITION(dw_window_get_data, void , HWND window, const char dataname)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10639 DW_FUNCTION_ADD_PARAM2(window, dataname)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10640 DW_FUNCTION_RETURN(dw_window_get_data, void *)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10641 DW_FUNCTION_RESTORE_PARAM2(window, HWND, dataname, const char *)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10642 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10643 id object = window;
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10644 void *retval = NULL;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10645
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10646 if([object isMemberOfClass:[DWWindow class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10647 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10648 UIWindow *win = window;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10649 NSArray *subviews = [win subviews];
2739 02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10650 for(id obj in subviews)
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10651 {
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10652 if([obj isMemberOfClass:[DWView class]])
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10653 {
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10654 object = obj;
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10655 break;
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10656 }
02c53dd5e21d iOS: I used to save the user data on the DWView subview of a DWWindow... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2738 diff changeset	10657 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10658 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10659 else if([object isMemberOfClass:[UIScrollView class]])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10660 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10661 UIScrollView *sv = window;
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10662 NSArray *subviews = [sv subviews];
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10663 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10664 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10665 WindowData blah = (WindowData )[object userdata];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10666
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10667 if(blah && blah->root && dataname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10668 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10669 UserData *ud = _dw_find_userdata(&(blah->root), dataname);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10670 if(ud)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10671 retval = ud->data;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10672 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10673 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10674 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10675
2532 457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10676 /*
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10677 * Compare two window handles.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10678 * Parameters:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10679 * window1: First window handle to compare.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10680 * window2: Second window handle to compare.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10681 * Returns:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10682 * TRUE if the windows are the same object, FALSE if not.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10683 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10684 int API dw_window_compare(HWND window1, HWND window2)
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10685 {
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10686 /* If anything special is require to compare... do it
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10687 * here otherwise just compare the handles.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10688 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10689 if(window1 && window2 && window1 == window2)
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10690 return TRUE;
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10691 return FALSE;
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10692 }
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2472 diff changeset	10693
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10694 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10695 * Add a callback to a timer event.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10696 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10697 * interval: Milliseconds to delay between calls.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 * sigfunc: The pointer to the function to be used as the callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10699 * data: User data to be passed to the handler function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10700 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10701 * Timer ID for use with dw_timer_disconnect(), 0 on error.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10702 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10703 DW_FUNCTION_DEFINITION(dw_timer_connect, HTIMER, int interval, void sigfunc, void data)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10704 DW_FUNCTION_ADD_PARAM3(interval, sigfunc, data)
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10705 DW_FUNCTION_RETURN(dw_timer_connect, HTIMER)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10706 DW_FUNCTION_RESTORE_PARAM3(interval, int, sigfunc, void , data, void )
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10707 {
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10708 HTIMER retval = 0;
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10709
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10710 if(sigfunc)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10711 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10712 NSTimeInterval seconds = (double)interval / 1000.0;
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10713
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10714 retval = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10715 _dw_new_signal(0, retval, 0, sigfunc, NULL, data);
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10716 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10717 DW_FUNCTION_RETURN_THIS(retval);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10718 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10719
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10720 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10721 * Removes timer callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10722 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10723 * id: Timer ID returned by dw_timer_connect().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10724 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10725 DW_FUNCTION_DEFINITION(dw_timer_disconnect, void, HTIMER timerid)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10726 DW_FUNCTION_ADD_PARAM1(timerid)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10727 DW_FUNCTION_NO_RETURN(dw_timer_disconnect)
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10728 DW_FUNCTION_RESTORE_PARAM1(timerid, HTIMER)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10729 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10730 DWSignalHandler prev = NULL, tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10731
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10732 /* 0 is an invalid timer ID */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10733 if(timerid)
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10734 {
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10735 NSTimer *thistimer = timerid;
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10736
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10737 [thistimer invalidate];
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10738
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10739 while(tmp)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10740 {
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10741 if(tmp->window == thistimer)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742 {
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10743 if(prev)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10744 {
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10745 prev->next = tmp->next;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10746 free(tmp);
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10747 tmp = prev->next;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10748 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10749 else
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10750 {
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10751 DWRoot = tmp->next;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10752 free(tmp);
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10753 tmp = DWRoot;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10754 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10755 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10756 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10757 {
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10758 prev = tmp;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10759 tmp = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10760 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10761 }
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10762 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10763 DW_FUNCTION_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10764 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10765
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10766 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10767 * Add a callback to a window event.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10768 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10769 * window: Window handle of signal to be called back.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10770 * signame: A string pointer identifying which signal to be hooked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10771 * sigfunc: The pointer to the function to be used as the callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10772 * data: User data to be passed to the handler function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10773 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10774 void API dw_signal_connect(HWND window, const char signame, void sigfunc, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10775 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10776 dw_signal_connect_data(window, signame, sigfunc, NULL, data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10777 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10778
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10779 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10780 * Add a callback to a window event with a closure callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10781 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10782 * window: Window handle of signal to be called back.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10783 * signame: A string pointer identifying which signal to be hooked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10784 * sigfunc: The pointer to the function to be used as the callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10785 * discfunc: The pointer to the function called when this handler is removed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10786 * data: User data to be passed to the handler function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10787 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10788 void API dw_signal_connect_data(HWND window, const char signame, void sigfunc, void discfunc, void data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10789 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10790 ULONG message = 0, msgid = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10791
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10792 /* Handle special case of application delete signal */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10793 if(!window && signame && strcmp(signame, DW_SIGNAL_DELETE) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10794 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10795 window = DWApp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10796 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10797
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10798 if(window && signame && sigfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10799 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10800 if((message = _dw_findsigmessage(signame)) != 0)
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10801 {
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10802 _dw_new_signal(message, window, (int)msgid, sigfunc, discfunc, data);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10803 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10804 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10805 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10806
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10807 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10808 * Removes callbacks for a given window with given name.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10809 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10810 * window: Window handle of callback to be removed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10811 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10812 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10813 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10814 DWSignalHandler prev = NULL, tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10815 ULONG message;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10816
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10817 if(!window \|\| !signame \|\| (message = _dw_findsigmessage(signame)) == 0)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10818 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10819
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10820 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10821 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10822 if(tmp->window == window && tmp->message == message)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10823 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10824 void (discfunc)(HWND, void ) = tmp->discfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10825
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10826 if(discfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10827 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10828 discfunc(tmp->window, tmp->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10829 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10830
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10831 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10832 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10833 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10834 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10835 tmp = prev->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10836 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10837 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10838 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10839 DWRoot = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10840 free(tmp);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10841 tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10842 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10843 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10844 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10845 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10846 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10847 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10848 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10849 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10850 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10851
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10852 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10853 * Removes all callbacks for a given window.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10854 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10855 * window: Window handle of callback to be removed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10856 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10857 void API dw_signal_disconnect_by_window(HWND window)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10858 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10859 DWSignalHandler prev = NULL, tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10860
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10861 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10862 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10863 if(tmp->window == window)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10864 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10865 void (discfunc)(HWND, void ) = tmp->discfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10866
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10867 if(discfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10868 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10869 discfunc(tmp->window, tmp->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10870 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10871
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10872 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10873 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10874 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10875 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10876 tmp = prev->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10877 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10878 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10879 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10880 DWRoot = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10881 free(tmp);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10882 tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10883 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10884 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10885 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10886 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10887 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10888 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10889 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10890 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10891 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10892
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10893 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10894 * Removes all callbacks for a given window with specified data.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10895 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10896 * window: Window handle of callback to be removed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10897 * data: Pointer to the data to be compared against.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10898 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10899 void API dw_signal_disconnect_by_data(HWND window, void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10900 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10901 DWSignalHandler prev = NULL, tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10902
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10903 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10904 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10905 if(tmp->window == window && tmp->data == data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10906 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10907 void (discfunc)(HWND, void ) = tmp->discfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10908
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10909 if(discfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10910 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10911 discfunc(tmp->window, tmp->data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10912 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10913
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10914 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10915 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10916 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10917 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10918 tmp = prev->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10919 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10920 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10921 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10922 DWRoot = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10923 free(tmp);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10924 tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10925 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10926 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10927 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10928 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10929 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10930 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10931 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10932 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10933 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10934
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10935 void _dw_my_strlwr(char *buf)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10936 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10937 int z, len = (int)strlen(buf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10938
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10939 for(z=0;z<len;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10940 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10941 if(buf[z] >= 'A' && buf[z] <= 'Z')
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10942 buf[z] -= 'A' - 'a';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10943 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10944 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10945
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10946 /* Open a shared library and return a handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10947 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10948 * name: Base name of the shared library.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10949 * handle: Pointer to a module handle,
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10950 * will be filled in with the handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10951 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10952 int dw_module_load(const char name, HMOD handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10953 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10954 int len;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10955 char *newname;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10956 char errorbuf[1025];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10957
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10958
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10959 if(!handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10960 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10961
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10962 if((len = (int)strlen(name)) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10963 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10964
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10965 /* Lenth + "lib" + ".dylib" + NULL */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10966 newname = malloc(len + 10);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10967
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10968 if(!newname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10969 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10970
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10971 sprintf(newname, "lib%s.dylib", name);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10972 _dw_my_strlwr(newname);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10973
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10974 *handle = dlopen(newname, RTLD_NOW);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10975 if(*handle == NULL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10976 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10977 strncpy(errorbuf, dlerror(), 1024);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10978 printf("%s\n", errorbuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10979 sprintf(newname, "lib%s.dylib", name);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10980 *handle = dlopen(newname, RTLD_NOW);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10981 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10982
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10983 free(newname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10984
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10985 return (NULL == *handle) ? -1 : 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10986 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10987
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10988 /* Queries the address of a symbol within open handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10989 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10990 * handle: Module handle returned by dw_module_load()
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10991 * name: Name of the symbol you want the address of.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10992 * func: A pointer to a function pointer, to obtain
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10993 * the address.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10994 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10995 int dw_module_symbol(HMOD handle, const char name, void*func)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10996 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10997 if(!func \|\| !name)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10998 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10999
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11000 if(strlen(name) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11001 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11002
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11003 func = (void)dlsym(handle, name);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11004 return (NULL == *func);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11005 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11006
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11007 /* Frees the shared library previously opened.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11008 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11009 * handle: Module handle returned by dw_module_load()
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11010 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11011 int dw_module_close(HMOD handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11012 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11013 if(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11014 return dlclose(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11015 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11016 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11017
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11018 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11019 * Returns the handle to an unnamed mutex semaphore.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11020 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11021 HMTX dw_mutex_new(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11022 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11023 HMTX mutex = malloc(sizeof(pthread_mutex_t));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11024
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11025 pthread_mutex_init(mutex, NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11026 return mutex;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11027 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11028
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11029 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11030 * Closes a semaphore created by dw_mutex_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11031 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11032 * mutex: The handle to the mutex returned by dw_mutex_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11033 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11034 void dw_mutex_close(HMTX mutex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11035 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11036 if(mutex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11037 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11038 pthread_mutex_destroy(mutex);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11039 free(mutex);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11040 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11041 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11042
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11043 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11044 * Tries to gain access to the semaphore, if it can't it blocks.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11045 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11046 * mutex: The handle to the mutex returned by dw_mutex_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11047 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11048 void dw_mutex_lock(HMTX mutex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11049 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11050 /* We need to handle locks from the main thread differently...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11051 * since we can't stop message processing... otherwise we
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11052 * will deadlock... so try to acquire the lock and continue
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11053 * processing messages in between tries.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11054 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11055 if(DWThread == pthread_self())
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11056 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11057 while(pthread_mutex_trylock(mutex) != 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11058 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11059 /* Process any pending events */
2635 3ec675648cf5 iOS: _dw_main_iteration() never seems to return NO. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	11060 _dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11061 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11062 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11063 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11064 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11065 pthread_mutex_lock(mutex);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11066 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11067 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11068
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11069 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11070 * Tries to gain access to the semaphore.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11071 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11072 * mutex: The handle to the mutex returned by dw_mutex_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11073 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11074 * DW_ERROR_NONE on success, DW_ERROR_TIMEOUT if it is already locked.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11075 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11076 int API dw_mutex_trylock(HMTX mutex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11077 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11078 if(pthread_mutex_trylock(mutex) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11079 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11080 return DW_ERROR_TIMEOUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11081 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11082
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11083 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11084 * Reliquishes the access to the semaphore.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11085 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11086 * mutex: The handle to the mutex returned by dw_mutex_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11087 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11088 void dw_mutex_unlock(HMTX mutex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11089 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11090 pthread_mutex_unlock(mutex);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11091 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11092
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11093 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11094 * Returns the handle to an unnamed event semaphore.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11095 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11096 HEV dw_event_new(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11097 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11098 HEV eve = (HEV)malloc(sizeof(struct _dw_unix_event));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11099
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11100 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11101 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11102
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11103 /* We need to be careful here, mutexes on Linux are
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11104 * FAST by default but are error checking on other
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11105 * systems such as FreeBSD and OS/2, perhaps others.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11106 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11107 pthread_mutex_init (&(eve->mutex), NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11108 pthread_mutex_lock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11109 pthread_cond_init (&(eve->event), NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11110
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11111 pthread_mutex_unlock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11112 eve->alive = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11113 eve->posted = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11114
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11115 return eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11116 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11117
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11118 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11119 * Resets a semaphore created by dw_event_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11120 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11121 * eve: The handle to the event returned by dw_event_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11122 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11123 int dw_event_reset (HEV eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11124 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11125 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11126 return DW_ERROR_NON_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11127
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11128 pthread_mutex_lock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11129 pthread_cond_broadcast (&(eve->event));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11130 pthread_cond_init (&(eve->event), NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11131 eve->posted = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11132 pthread_mutex_unlock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11133 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11134 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11135
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11136 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11137 * Posts a semaphore created by dw_event_new(). Causing all threads
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11138 * waiting on this event in dw_event_wait to continue.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11139 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11140 * eve: The handle to the event returned by dw_event_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11141 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11142 int dw_event_post (HEV eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11143 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11144 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11145 return FALSE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11146
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11147 pthread_mutex_lock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11148 pthread_cond_broadcast (&(eve->event));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11149 eve->posted = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11150 pthread_mutex_unlock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11151 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11152 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11153
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11154 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11155 * Waits on a semaphore created by dw_event_new(), until the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11156 * event gets posted or until the timeout expires.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11157 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11158 * eve: The handle to the event returned by dw_event_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11159 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11160 int dw_event_wait(HEV eve, unsigned long timeout)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11161 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11162 int rc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11163
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11164 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11165 return DW_ERROR_NON_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11166
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11167 pthread_mutex_lock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11168
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11169 if(eve->posted)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11170 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11171 pthread_mutex_unlock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11172 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11173 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11174
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11175 if(timeout != -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11176 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177 struct timeval now;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11178 struct timespec timeo;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11179
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11180 gettimeofday(&now, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11181 timeo.tv_sec = now.tv_sec + (timeout / 1000);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11182 timeo.tv_nsec = now.tv_usec * 1000;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11183 rc = pthread_cond_timedwait(&(eve->event), &(eve->mutex), &timeo);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11184 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11185 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11186 rc = pthread_cond_wait(&(eve->event), &(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11187 pthread_mutex_unlock (&(eve->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11188 if(!rc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11189 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11190 if(rc == ETIMEDOUT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11191 return DW_ERROR_TIMEOUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11192 return DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11193 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11194
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11195 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196 * Closes a semaphore created by dw_event_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11197 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11198 * eve: The handle to the event returned by dw_event_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11199 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11200 int dw_event_close(HEV *eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11201 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11202 if(!eve \|\| !(*eve))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11203 return DW_ERROR_NON_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11204
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11205 pthread_mutex_lock (&((*eve)->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11206 pthread_cond_destroy (&((*eve)->event));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11207 pthread_mutex_unlock (&((*eve)->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11208 pthread_mutex_destroy (&((*eve)->mutex));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11209 free(*eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11210 *eve = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11211
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11212 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11213 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11214
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11215 struct _seminfo {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216 int fd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11217 int waiting;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11218 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11219
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11220 static void _dw_handle_sem(int *tmpsock)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 fd_set rd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11223 struct _seminfo array = (struct _seminfo )malloc(sizeof(struct _seminfo));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11224 int listenfd = tmpsock[0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11225 int bytesread, connectcount = 1, maxfd, z, posted = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11226 char command;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11227 sigset_t mask;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11228
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11229 sigfillset(&mask); /* Mask all allowed signals */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11230 pthread_sigmask(SIG_BLOCK, &mask, NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11231
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11232 /* problems */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11233 if(tmpsock[1] == -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11234 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11235 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11236 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11237 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11238
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11239 array[0].fd = tmpsock[1];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11240 array[0].waiting = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11241
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11242 /* Free the memory allocated in dw_named_event_new. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11243 free(tmpsock);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11244
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11245 while(1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11246 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11247 FD_ZERO(&rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11248 FD_SET(listenfd, &rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11249
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11250 maxfd = listenfd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11251
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11252 /* Added any connections to the named event semaphore */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11253 for(z=0;z<connectcount;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11254 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11255 if(array[z].fd > maxfd)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 maxfd = array[z].fd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11257
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11258 FD_SET(array[z].fd, &rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11259 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11260
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11261 if(select(maxfd+1, &rd, NULL, NULL, NULL) == -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11262 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11263 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11264 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11265 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11266
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11267 if(FD_ISSET(listenfd, &rd))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11268 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11269 struct _seminfo *newarray;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11270 int newfd = accept(listenfd, 0, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11271
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11272 if(newfd > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11273 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11274 /* Add new connections to the set */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11275 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount+1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11276 memcpy(newarray, array, sizeof(struct _seminfo)*(connectcount));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11277
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11278 newarray[connectcount].fd = newfd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11279 newarray[connectcount].waiting = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11280
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11281 connectcount++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11282
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11283 /* Replace old array with new one */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11284 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11285 array = newarray;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11286 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11287 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11288
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11289 /* Handle any events posted to the semaphore */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11290 for(z=0;z<connectcount;z++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11291 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11292 if(FD_ISSET(array[z].fd, &rd))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11293 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11294 if((bytesread = (int)read(array[z].fd, &command, 1)) < 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11296 struct _seminfo *newarray = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11297
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11298 /* Remove this connection from the set */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11299 if(connectcount > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11300 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11301 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount-1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11302 if(!z)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11303 memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11304 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11305 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11306 memcpy(newarray, array, sizeof(struct _seminfo)*z);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11307 if(z!=(connectcount-1))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11308 memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-1));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11309 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11310 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11311 connectcount--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11312
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11313 /* Replace old array with new one */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11314 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11315 array = newarray;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11316 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11317 else if(bytesread == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11318 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11319 switch(command)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11321 case 0:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11322 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11323 /* Reset */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11324 posted = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11325 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11326 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11327 case 1:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11328 /* Post */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11329 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11330 int s;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 char tmp = (char)0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11332
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11333 posted = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11334
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335 for(s=0;s<connectcount;s++)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11337 /* The semaphore has been posted so
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 * we tell all the waiting threads to
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11339 * continue.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11340 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11341 if(array[s].waiting)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11342 write(array[s].fd, &tmp, 1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11343 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11344 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11345 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11346 case 2:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11347 /* Wait */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11348 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11349 char tmp = (char)0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11350
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11351 array[z].waiting = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11352
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11353 /* If we are posted exit immeditately */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11354 if(posted)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11355 write(array[z].fd, &tmp, 1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11356 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11357 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11358 case 3:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11359 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11360 /* Done Waiting */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11361 array[z].waiting = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11362 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11363 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11364 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11365 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11366 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11367 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11368 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11369 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11370
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11371 /* Using domain sockets on unix for IPC */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11372 /* Create a named event semaphore which can be
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11373 * opened from other processes.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11374 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11375 * eve: Pointer to an event handle to receive handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11376 * name: Name given to semaphore which can be opened
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11377 * by other processes.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11378 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11379 HEV dw_named_event_new(const char *name)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11380 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11381 struct sockaddr_un un;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11382 int ev, tmpsock = (int )malloc(sizeof(int)*2);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11383 HEV eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11384 DWTID dwthread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11385
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11386 if(!tmpsock)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11387 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11388
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11389 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11390
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11391 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11392 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11393 free(tmpsock);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11394 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11395 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11396
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11397 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11398 ev = socket(AF_UNIX, SOCK_STREAM, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11399 memset(&un, 0, sizeof(un));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11400 un.sun_family=AF_UNIX;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11401 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11402 strcpy(un.sun_path, "/tmp/.dw/");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11403 strcat(un.sun_path, name);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11404
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11405 /* just to be safe, this should be changed
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11406 * to support multiple instances.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11407 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11408 remove(un.sun_path);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11409
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11410 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11411 listen(tmpsock[0], 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11412 connect(ev, (struct sockaddr *)&un, sizeof(un));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11413 tmpsock[1] = accept(tmpsock[0], 0, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11414
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11415 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11416 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11417 if(tmpsock[0] > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11418 close(tmpsock[0]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11419 if(tmpsock[1] > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11420 close(tmpsock[1]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11421 if(ev > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11422 close(ev);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11423 free(tmpsock);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11424 free(eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11425 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11426 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11427
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11428 /* Create a thread to handle this event semaphore */
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11429 pthread_create(&dwthread, NULL, (void )_dw_handle_sem, (void )tmpsock);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11430 eve->alive = ev;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11431 return eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11432 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11433
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11434 /* Open an already existing named event semaphore.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11435 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11436 * eve: Pointer to an event handle to receive handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11437 * name: Name given to semaphore which can be opened
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11438 * by other processes.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11439 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11440 HEV dw_named_event_get(const char *name)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11441 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11442 struct sockaddr_un un;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11443 HEV eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11444 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11445 if(ev < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11446 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11447
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11448 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11449
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11450 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11451 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11452 close(ev);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11453 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11454 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11455
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11456 un.sun_family=AF_UNIX;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11457 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11458 strcpy(un.sun_path, "/tmp/.dw/");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11459 strcat(un.sun_path, name);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11460 connect(ev, (struct sockaddr *)&un, sizeof(un));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11461 eve->alive = ev;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11462 return eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11463 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11464
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11465 /* Resets the event semaphore so threads who call wait
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11466 * on this semaphore will block.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11467 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11468 * eve: Handle to the semaphore obtained by
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11469 * an open or create call.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11470 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11471 int dw_named_event_reset(HEV eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11472 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11473 /* signal reset */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11474 char tmp = (char)0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11475
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11476 if(!eve \|\| eve->alive < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11477 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11478
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11479 if(write(eve->alive, &tmp, 1) == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11480 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11481 return 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11482 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11483
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11484 /* Sets the posted state of an event semaphore, any threads
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11485 * waiting on the semaphore will no longer block.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11486 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11487 * eve: Handle to the semaphore obtained by
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11488 * an open or create call.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11489 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11490 int dw_named_event_post(HEV eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11491 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11492
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11493 /* signal post */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11494 char tmp = (char)1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11495
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11496 if(!eve \|\| eve->alive < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11497 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11498
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11499 if(write(eve->alive, &tmp, 1) == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11500 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11501 return 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11502 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11503
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11504 /* Waits on the specified semaphore until it becomes
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11505 * posted, or returns immediately if it already is posted.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11506 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11507 * eve: Handle to the semaphore obtained by
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11508 * an open or create call.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11509 * timeout: Number of milliseconds before timing out
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11510 * or -1 if indefinite.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11511 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11512 int dw_named_event_wait(HEV eve, unsigned long timeout)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11513 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11514 fd_set rd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11515 struct timeval tv, *useme = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11516 int retval = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11517 char tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11518
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11519 if(!eve \|\| eve->alive < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11520 return DW_ERROR_NON_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11521
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11522 /* Set the timout or infinite */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11523 if(timeout != -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11524 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11525 tv.tv_sec = timeout / 1000;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11526 tv.tv_usec = (int)timeout % 1000;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11527
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11528 useme = &tv;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11529 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11530
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11531 FD_ZERO(&rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11532 FD_SET(eve->alive, &rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11533
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11534 /* Signal wait */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11535 tmp = (char)2;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11536 write(eve->alive, &tmp, 1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11537
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11538 retval = select(eve->alive+1, &rd, NULL, NULL, useme);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11539
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11540 /* Signal done waiting. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11541 tmp = (char)3;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11542 write(eve->alive, &tmp, 1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11543
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11544 if(retval == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11545 return DW_ERROR_TIMEOUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11546 else if(retval == -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11547 return DW_ERROR_INTERRUPT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11548
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11549 /* Clear the entry from the pipe so
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11550 * we don't loop endlessly. :)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11551 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11552 read(eve->alive, &tmp, 1);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11553 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11554 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11555
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11556 /* Release this semaphore, if there are no more open
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11557 * handles on this semaphore the semaphore will be destroyed.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11558 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11559 * eve: Handle to the semaphore obtained by
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11560 * an open or create call.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11561 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11562 int dw_named_event_close(HEV eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11563 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11564 /* Finally close the domain socket,
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11565 * cleanup will continue in _dw_handle_sem.
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11566 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11567 if(eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11568 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11569 close(eve->alive);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11570 free(eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11571 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11572 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11573 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11574
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11575 /* Mac specific function to cause garbage collection */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11576 void _dw_pool_drain(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11577 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11578 NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11579 [pool drain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11580 pool = [[NSAutoreleasePool alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11581 pthread_setspecific(_dw_pool_key, pool);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11582 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11583
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11584 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11585 * Generally an internal function called from a newly created
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11586 * thread to setup the Dynamic Windows environment for the thread.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11587 * However it is exported so language bindings can call it when
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11588 * they create threads that require access to Dynamic Windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11589 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11590 void API _dw_init_thread(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11591 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11592 /* If we aren't using garbage collection we need autorelease pools */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11593 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11594 pthread_setspecific(_dw_pool_key, pool);
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	11595 _dw_init_colors();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11596 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11597
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11598 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11599 * Generally an internal function called from a terminating
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11600 * thread to cleanup the Dynamic Windows environment for the thread.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11601 * However it is exported so language bindings can call it when
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11602 * they exit threads that require access to Dynamic Windows.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11603 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11604 void API _dw_deinit_thread(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11605 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11606 UIColor *color;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11607
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11608 /* Release the pool when we are done so we don't leak */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11609 color = pthread_getspecific(_dw_fg_color_key);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11610 [color release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11611 color = pthread_getspecific(_dw_bg_color_key);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11612 [color release];
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11613 NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11614 [pool drain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11615 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11616
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11617 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11618 * Setup thread independent pools.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11619 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11620 void _dwthreadstart(void *data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11621 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11622 void (threadfunc)(void ) = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11623 void tmp = (void )data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11624
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11625 _dw_init_thread();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11626
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11627 threadfunc = (void ()(void ))tmp[0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11628
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11629 /* Start our thread function */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11630 threadfunc(tmp[1]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11631
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11632 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11633
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11634 _dw_deinit_thread();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11635 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11636
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11637 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11638 * Sets the default font used on text based widgets.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11639 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11640 * fontname: Font name in Dynamic Windows format.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11641 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11642 void API dw_font_set_default(const char *fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11643 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11644 UIFont *oldfont = DWDefaultFont;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11645 DWDefaultFont = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11646 if(fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11647 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11648 DWDefaultFont = _dw_font_by_name(fontname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11649 [DWDefaultFont retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11650 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11651 [oldfont release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11652 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11653
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11654 /* Thread start stub to launch our main */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11655 void _dw_main_launch(void **data)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11656 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11657 int (_dwmain)(int argc, char argv) = (int ()(int, char **))data[0];
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11658 int argc = DW_POINTER_TO_INT(data[1]);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11659 char argv = (char )data[2];
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11660
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11661 _dwmain(argc, argv);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11662 free(data);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11663 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11664
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11665 /* The iOS main thread... all this does is handle messages */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11666 void _dw_main_thread(int argc, char *argv[])
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11667 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11668 DWMainEvent = dw_event_new();
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11669 dw_event_reset(DWMainEvent);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11670 /* We wait for the dw_init() in the user's main function */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11671 dw_event_wait(DWMainEvent, DW_TIMEOUT_INFINITE);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11672 DWThread = dw_thread_id();
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11673 DWObj = [[DWObject alloc] init];
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	11674 /* Create object for handling timers */
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	11675 DWHandler = [[DWTimerHandler alloc] init];
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11676 UIApplicationMain(argc, argv, nil, NSStringFromClass([DWAppDel class]));
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11677 /* Shouldn't get here, but ... just in case */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11678 DWThread = (DWTID)-1;
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11679 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11680
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11681 /* If DWApp is uninitialized, initialize it */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11682 void _dw_app_init(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11683 {
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11684 /* The UIApplication singleton won't be created until we call
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11685 * UIApplicationMain() which blocks indefinitely.. so we have
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11686 * a thread to just run UIApplicationMain() .. and wait until
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11687 * we get a non-nil sharedApplication result.
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11688 */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11689 while(!DWApp)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11690 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11691 static int posted = FALSE;
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11692
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11693 if(DWMainEvent && !posted)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11694 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11695 /* Post the DWMainEvent so the main thread
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11696 * will call UIApplicationMain() creating
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11697 * the UIApplication sharedApplication.
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11698 */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11699 posted = TRUE;
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11700 dw_event_post(DWMainEvent);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11701 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11702 pthread_yield_np();
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	11703 DWApp = [UIApplication sharedApplication];
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11704 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11705 dw_event_reset(DWMainEvent);
2402 b28852b35452 iOS: Fix message boxes... the hiddenWindow they are attached to was being bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2401 diff changeset	11706 [DWObj performSelectorOnMainThread:@selector(delayedInit:) withObject:nil waitUntilDone:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11707 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11708
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11709 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11710 * Initializes the Dynamic Windows engine.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11711 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11712 * newthread: True if this is the only thread.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11713 * False if there is already a message loop running.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11714 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11715 int API dw_init(int newthread, int argc, char *argv[])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11716 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11717 char *lang = getenv("LANG");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11718
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11719 /* Correct the startup path if run from a bundle */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11720 if(argc > 0 && argv[0])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11721 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11722 char *pathcopy = strdup(argv[0]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11723 char *app = strstr(pathcopy, ".app/");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11724 char *binname = strrchr(pathcopy, '/');
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11725
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11726 if(binname && (binname++) && !_dw_app_id[0])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11727 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11728 /* If we have a binary name, use that for the Application ID instead. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11729 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.%s", DW_APP_DOMAIN_DEFAULT, binname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11730 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11731 if(app)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11732 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11733 char pathbuf[PATH_MAX+1] = { 0 };
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11734 size_t len = (size_t)(app - pathcopy);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11735
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11736 if(len > 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11737 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11738 strncpy(_dw_bundle_path, pathcopy, len + 4);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11739 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11740 *app = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11741
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11742 getcwd(pathbuf, PATH_MAX);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11743
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11744 /* If run from a bundle the path seems to be / */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11745 if(strcmp(pathbuf, "/") == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11746 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11747 char *pos = strrchr(pathcopy, '/');
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11748
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11749 if(pos)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11750 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11751 strncpy(pathbuf, pathcopy, (size_t)(pos - pathcopy));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11752 chdir(pathbuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11753 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11754 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11755 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11756 if(pathcopy)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11757 free(pathcopy);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11758 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11759
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11760 /* Just in case we can't obtain a path */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11761 if(!_dw_bundle_path[0])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11762 getcwd(_dw_bundle_path, PATH_MAX);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11763
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11764 /* Get the operating system version */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11765 NSString *version = [[NSProcessInfo processInfo] operatingSystemVersionString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11766 const char *versionstr = [version UTF8String];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11767 sscanf(versionstr, "Version %d.%d.%d", &DWOSMajor, &DWOSMinor, &DWOSBuild);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11768 /* Set the locale... if it is UTF-8 pass it
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11769 * directly, otherwise specify UTF-8 explicitly.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11770 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11771 setlocale(LC_ALL, lang && strstr(lang, ".UTF-8") ? lang : "UTF-8");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11772 /* Create the application object */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11773 _dw_app_init();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11774 pthread_key_create(&_dw_pool_key, NULL);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11775 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
2638 b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	11776 _dw_toplevel_windows = [[NSMutableArray new] retain];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11777 pthread_setspecific(_dw_pool_key, pool);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11778 pthread_key_create(&_dw_fg_color_key, NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11779 pthread_key_create(&_dw_bg_color_key, NULL);
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	11780 _dw_init_colors();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11781 DWDefaultFont = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11782 if (@available(iOS 10.0, *))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11783 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11784 if([[NSBundle mainBundle] bundleIdentifier] != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11785 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11786 UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11787 if(center)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11788 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11789 [center requestAuthorizationWithOptions:UNAuthorizationOptionAlert\|UNAuthorizationOptionSound
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11790 completionHandler:^(BOOL granted, NSError * _Nullable error) {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11791 if (granted)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11792 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11793 center.delegate = [[DWUserNotificationCenterDelegate alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11794 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11795 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11796 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11797 NSLog(@"WARNING: Unable to get notification permission. %@", error.localizedDescription);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11798 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11799 }];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11800 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11801 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11802 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11803 _DWDirtyDrawables = [[NSMutableArray alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11804 /* Use NSThread to start a dummy thread to initialize the threading subsystem */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11805 NSThread *thread = [[ NSThread alloc] initWithTarget:DWObj selector:@selector(uselessThread:) object:nil];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11806 [thread start];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11807 [thread release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11808 if(!_dw_app_id[0])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11809 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11810 /* Generate an Application ID based on the PID if all else fails. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11811 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.pid.%d", DW_APP_DOMAIN_DEFAULT, getpid());
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11812 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11813 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11814 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11815
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11816 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11817 * Allocates a shared memory region with a name.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11818 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11819 * handle: A pointer to receive a SHM identifier.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11820 * dest: A pointer to a pointer to receive the memory address.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11821 * size: Size in bytes of the shared memory region to allocate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11822 * name: A string pointer to a unique memory name.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11823 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11824 HSHM dw_named_memory_new(void *dest, int size, const char name)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11825 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11826 char namebuf[1025] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11827 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11828
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11829 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11830 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11831
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11832 if((handle->fd = open(namebuf, O_CREAT \| O_RDWR, S_IRUSR \| S_IWUSR)) < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11833 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11834 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11835 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11836 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11837
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11838 ftruncate(handle->fd, size);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11839
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11840 /* attach the shared memory segment to our process's address space. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11841 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11842
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11843 if(*dest == MAP_FAILED)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11844 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11845 close(handle->fd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11846 *dest = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11847 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11848 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11849 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11850
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11851 handle->size = size;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11852 handle->sid = getsid(0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11853 handle->path = strdup(namebuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11854
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11855 return handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11856 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11857
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11858 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11859 * Aquires shared memory region with a name.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11860 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11861 * dest: A pointer to a pointer to receive the memory address.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11862 * size: Size in bytes of the shared memory region to requested.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11863 * name: A string pointer to a unique memory name.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11864 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11865 HSHM dw_named_memory_get(void *dest, int size, const char name)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11866 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11867 char namebuf[1025];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11868 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11869
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11870 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11871 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11872
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11873 if((handle->fd = open(namebuf, O_RDWR)) < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11874 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11875 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11876 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11877 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11878
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11879 /* attach the shared memory segment to our process's address space. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11880 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11881
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11882 if(*dest == MAP_FAILED)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11883 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11884 close(handle->fd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11885 *dest = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11886 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11887 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11888 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11889
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11890 handle->size = size;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11891 handle->sid = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11892 handle->path = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11893
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11894 return handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11895 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11896
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11897 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11898 * Frees a shared memory region previously allocated.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11899 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11900 * handle: Handle obtained from DB_named_memory_allocate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11901 * ptr: The memory address aquired with DB_named_memory_allocate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11902 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11903 int dw_named_memory_free(HSHM handle, void *ptr)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11904 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11905 struct _dw_unix_shm *h = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11906 int rc = munmap(ptr, h->size);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11907
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11908 close(h->fd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11909 if(h->path)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11910 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11911 /* Only remove the actual file if we are the
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11912 * creator of the file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11913 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11914 if(h->sid != -1 && h->sid == getsid(0))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11915 remove(h->path);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11916 free(h->path);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11917 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11918 return rc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11919 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11920
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11921 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11922 * Creates a new thread with a starting point of func.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11923 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11924 * func: Function which will be run in the new thread.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11925 * data: Parameter(s) passed to the function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11926 * stack: Stack size of new thread (OS/2 and Windows only).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11927 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11928 DWTID dw_thread_new(void func, void data, int stack)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11929 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11930 DWTID thread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11931 void *tmp = malloc(sizeof(void ) * 2);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11932 int rc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11933
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11934 tmp[0] = func;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11935 tmp[1] = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11936
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11937 rc = pthread_create(&thread, NULL, (void )_dwthreadstart, (void )tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11938 if(rc == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11939 return thread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11940 return (DWTID)-1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11941 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11942
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11943 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11944 * Ends execution of current thread immediately.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11945 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11946 void dw_thread_end(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11947 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11948 pthread_exit(NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11949 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11950
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11951 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11952 * Returns the current thread's ID.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11953 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11954 DWTID dw_thread_id(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11955 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11956 return (DWTID)pthread_self();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11957 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11958
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11959 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11960 * Execute and external program in a seperate session.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11961 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11962 * program: Program name with optional path.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11963 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11964 * params: An array of pointers to string arguements.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11965 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11966 * DW_ERROR_UNKNOWN (-1) on error.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11967 */
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11968 int API dw_exec(const char program, int type, char *params)
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11969 {
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11970 int retval = DW_ERROR_UNKNOWN;
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11971 pid_t pid;
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11972
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11973 /* Launch the application directly using posix_spawnp()
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11974 * Might need to use openURLs to open DW_EXEC_GUI.
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11975 */
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11976 if(posix_spawnp(&pid, program, NULL, NULL, params, NULL) == 0)
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11977 {
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11978 if(pid > 0)
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11979 retval = pid;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11980 else
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11981 retval = DW_ERROR_NONE;
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11982 }
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11983 return retval;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11984 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11985
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11986 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11987 * Loads a web browser pointed at the given URL.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11988 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11989 * url: Uniform resource locator.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11990 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11991 int dw_browse(const char *url)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11992 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11993 NSURL *myurl = [NSURL URLWithString:[NSString stringWithUTF8String:url]];
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	11994 [DWApp openURL:myurl options:@{}
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	11995 completionHandler:^(BOOL success) {}];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11996 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11997 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11998
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11999 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12000 * Creates a new print object.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12001 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12002 * jobname: Name of the print job to show in the queue.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12003 * flags: Flags to initially configure the print object.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12004 * pages: Number of pages to print.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12005 * drawfunc: The pointer to the function to be used as the callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12006 * drawdata: User data to be passed to the handler function.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12007 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12008 * A handle to the print object or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12009 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12010 HPRINT API dw_print_new(const char jobname, unsigned long flags, unsigned int pages, void drawfunc, void *drawdata)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12011 {
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12012 if(drawfunc)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12013 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12014 UIPrintInfo *pi = [UIPrintInfo alloc];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12015 DWPrintPageRenderer *renderer = [DWPrintPageRenderer new];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12016 NSMutableArray *pa = [[[NSMutableArray alloc] initWithObjects:pi, renderer, nil] retain];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12017
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12018 if(!jobname)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12019 jobname = "Dynamic Windows Print Job";
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12020
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12021 [pi setOutputType:UIPrintInfoOutputGeneral];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12022 [pi setJobName:[NSString stringWithUTF8String:jobname]];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12023 [pi setOrientation:UIPrintInfoOrientationPortrait];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12024 [renderer setDrawFunc:drawfunc];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12025 [renderer setDrawData:drawdata];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12026 [renderer setPages:pages];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12027 [renderer setFlags:flags];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12028 [renderer setPrint:pa];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12029 return pa;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12030 }
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	12031 return NULL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12032 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12033
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12034 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12035 * Runs the print job, causing the draw page callbacks to fire.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12036 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12037 * print: Handle to the print object returned by dw_print_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12038 * flags: Flags to run the print job.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12039 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12040 * DW_ERROR_UNKNOWN on error or DW_ERROR_NONE on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12041 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12042 int API dw_print_run(HPRINT print, unsigned long flags)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12043 {
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12044 int retval = DW_ERROR_UNKNOWN;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12045
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12046 if(print)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12047 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12048 NSMutableArray *pa = print;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12049
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12050 [pa addObject:[NSNumber numberWithUnsignedLong:flags]];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12051 [DWObj safeCall:@selector(printDialog:) withObject:pa];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12052 retval = (int)[[pa lastObject] integerValue];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12053 [pa release];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12054 }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12055 return retval;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12056 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12057
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12058 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12059 * Cancels the print job, typically called from a draw page callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12060 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12061 * print: Handle to the print object returned by dw_print_new().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12062 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12063 void API dw_print_cancel(HPRINT print)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12064 {
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12065 if(print)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12066 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12067 NSMutableArray *pa = print;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12068 UIPrintInteractionController *pc = [UIPrintInteractionController sharedPrintController];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12069
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12070 [pc dismissAnimated:YES];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12071 [pa release];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12072 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12073 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12074
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12075 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12076 * Converts a UTF-8 encoded string into a wide string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12077 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12078 * utf8string: UTF-8 encoded source string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12079 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12080 * Wide string that needs to be freed with dw_free()
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12081 * or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12082 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12083 wchar_t * API dw_utf8_to_wchar(const char *utf8string)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12084 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12085 size_t buflen = strlen(utf8string) + 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12086 wchar_t temp = malloc(buflen sizeof(wchar_t));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12087 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12088 mbstowcs(temp, utf8string, buflen);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12089 return temp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12090 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12091
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12092 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12093 * Converts a wide string into a UTF-8 encoded string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12094 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12095 * wstring: Wide source string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12096 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12097 * UTF-8 encoded string that needs to be freed with dw_free()
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12098 * or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12099 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12100 char * API dw_wchar_to_utf8(const wchar_t *wstring)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12101 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12102 size_t bufflen = 8 * wcslen(wstring) + 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12103 char *temp = malloc(bufflen);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12104 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12105 wcstombs(temp, wstring, bufflen);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12106 return temp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12107 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12108
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12109 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12110 * Gets the state of the requested library feature.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12111 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12112 * feature: The requested feature for example DW_FEATURE_DARK_MODE
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12113 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12114 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12115 * DW_FEATURE_DISABLED if the feature is supported but disabled.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12116 * DW_FEATURE_ENABLED if the feature is supported and enabled.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12117 * Other value greater than 1, same as enabled but with extra info.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12118 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12119 int API dw_feature_get(DWFEATURE feature)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12120 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12121 switch(feature)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12122 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12123 case DW_FEATURE_NOTIFICATION:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12124 case DW_FEATURE_MLE_AUTO_COMPLETE:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12125 case DW_FEATURE_HTML:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12126 case DW_FEATURE_HTML_RESULT:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12127 case DW_FEATURE_CONTAINER_STRIPE:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12128 case DW_FEATURE_MLE_WORD_WRAP:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12129 case DW_FEATURE_UTF8_UNICODE:
2771 52f3858035d8 iOS: Change reporting tree widget to be supported. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2770 diff changeset	12130 case DW_FEATURE_TREE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12131 return DW_FEATURE_ENABLED;
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12132 case DW_FEATURE_CONTAINER_MODE:
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12133 return _dw_container_mode;
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12134 case DW_FEATURE_DARK_MODE:
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12135 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12136 if(DWObj)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12137 {
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12138 NSMutableArray *array = [[NSMutableArray alloc] init];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12139 int retval = DW_FEATURE_UNSUPPORTED;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12140 NSNumber *number;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12141
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12142 [DWObj safeCall:@selector(getUserInterfaceStyle:) withObject:array];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12143 number = [array lastObject];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12144 if(number)
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12145 retval = [number intValue];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12146 return retval;
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12147 }
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12148 return _dw_dark_mode_state;
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12149 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12150 default:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12151 return DW_FEATURE_UNSUPPORTED;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12152 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12153 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12154
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12155 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12156 * Sets the state of the requested library feature.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12157 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12158 * feature: The requested feature for example DW_FEATURE_DARK_MODE
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12159 * state: DW_FEATURE_DISABLED, DW_FEATURE_ENABLED or any value greater than 1.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12160 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12161 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12162 * DW_ERROR_NONE if the feature is supported and successfully configured.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12163 * DW_ERROR_GENERAL if the feature is supported but could not be configured.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12164 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12165 * These settings are typically used during dw_init() so issue before
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12166 * setting up the library with dw_init().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12167 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12168 int API dw_feature_set(DWFEATURE feature, int state)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12169 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12170 switch(feature)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12171 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12172 /* These features are supported but not configurable */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12173 case DW_FEATURE_NOTIFICATION:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12174 case DW_FEATURE_MLE_AUTO_COMPLETE:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12175 case DW_FEATURE_HTML:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12176 case DW_FEATURE_HTML_RESULT:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12177 case DW_FEATURE_CONTAINER_STRIPE:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12178 case DW_FEATURE_MLE_WORD_WRAP:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12179 case DW_FEATURE_UTF8_UNICODE:
2771 52f3858035d8 iOS: Change reporting tree widget to be supported. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2770 diff changeset	12180 case DW_FEATURE_TREE:
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12181 return DW_ERROR_GENERAL;
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12182 case DW_FEATURE_CONTAINER_MODE:
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12183 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12184 if(state >= DW_CONTAINER_MODE_DEFAULT && state < DW_CONTAINER_MODE_MAX)
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12185 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12186 _dw_container_mode = state;
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12187 return DW_ERROR_NONE;
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12188 }
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12189 return DW_ERROR_GENERAL;
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12190 }
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12191 case DW_FEATURE_DARK_MODE:
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12192 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12193 /* Make sure DWObj is initialized */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12194 if(DWObj)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12195 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12196 /* Disabled forces the non-dark aqua theme */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12197 if(state == DW_FEATURE_DISABLED)
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12198 [DWObj safeCall:@selector(setUserInterfaceStyle:) withObject:[NSNumber numberWithInt:UIUserInterfaceStyleLight]];
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12199 /* Enabled lets the OS decide the mode */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12200 else if(state == DW_FEATURE_ENABLED \|\| state == DW_DARK_MODE_FULL)
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12201 [DWObj safeCall:@selector(setUserInterfaceStyle:) withObject:[NSNumber numberWithInt:UIUserInterfaceStyleUnspecified]];
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12202 /* 2 forces dark mode aqua appearance */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12203 else if(state == DW_DARK_MODE_FORCED)
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12204 [DWObj safeCall:@selector(setUserInterfaceStyle:) withObject:[NSNumber numberWithInt:UIUserInterfaceStyleDark]];
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12205 }
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12206 else /* Save the requested state for dw_init() */
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12207 _dw_dark_mode_state = state;
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12208 return DW_ERROR_NONE;
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12209 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12210 default:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12211 return DW_FEATURE_UNSUPPORTED;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12212 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12213 }

Mercurial > dwindows

annotate ios/dw.m @ 2830:cc9258ba53d7