dwindows: ios/dw.m annotate

annotate ios/dw.m @ 2882:99311a9091af

C++: Add lambda support via Connect functions on C++11, on older compilers use traditional function pointers instead. Also added inital menu support although it is incomplete as of this commit.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 22 Dec 2022 13:59:46 +0000
parents	86286f528adf
children	ec0d34798706

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
2844 1df137a1a4b9 iOS: Minor code style cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2832 diff changeset	2108 -(id)init
1df137a1a4b9 iOS: Minor code style cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2832 diff changeset	2109 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2110 self = [super init];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2111 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	2112 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	2113 [self addSubview:tabs];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2114 return self;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2115 }
2844 1df137a1a4b9 iOS: Minor code style cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2832 diff changeset	2116 -(void)setFrame:(CGRect)frame
1df137a1a4b9 iOS: Minor code style cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2832 diff changeset	2117 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2118 [super setFrame:frame];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2119 frame.size.height = 40;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2120 [tabs setFrame:frame];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2121 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2122 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2123 -(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	2124 -(int)pageid { return pageid; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2125 -(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	2126 -(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	2127 -(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	2128 -(NSMutableArray<DWNotebookPage > )views { return views; };
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	2129 -(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	2130 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2131 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	2132
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	2133 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	2134 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2135 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	2136
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2137 /* 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	2138 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	2139 [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	2140
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2141 /* 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	2142 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	2143 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2144 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	2145 /* 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	2146 * 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	2147 */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2148 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	2149 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	2150 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	2151 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	2152 [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	2153 [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	2154 visible = page;
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	2155 _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	2156 _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	2157 }
2693 0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2158 _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	2159 }
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2160 else
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	2161 visible = nil;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2162 }
2844 1df137a1a4b9 iOS: Minor code style cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2832 diff changeset	2163 -(void)dealloc
1df137a1a4b9 iOS: Minor code style cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2832 diff changeset	2164 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2165 UserData *root = userdata;
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2166 _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	2167 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	2168 [tabs removeFromSuperview];
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2169 [tabs release];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2170 [views release];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2171 [super dealloc];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	2172 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2173 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2174
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175 @implementation DWNotebookPage
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2176 -(int)pageid { return pageid; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2177 -(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	2178 -(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	2179 @end
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 /* Subclass for a splitbar type */
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2182 @interface DWSplitBar : UIView
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2183 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2184 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2185 float percent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2186 NSInteger Tag;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2187 id topleft;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2188 id bottomright;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2189 int splittype;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2190 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2191 -(void)setTag:(NSInteger)tag;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2192 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2193 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2194 -(float)percent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2195 -(void)setPercent:(float)input;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2196 -(id)topLeft;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2197 -(void)setTopLeft:(id)input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2198 -(id)bottomRight;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2199 -(void)setBottomRight:(id)input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2200 -(int)type;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2201 -(void)setType:(int)input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2202 -(void)resize;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2203 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2204
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2205 @implementation DWSplitBar
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2206 -(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	2207 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2208 -(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	2209 -(float)percent { return percent; }
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2210 -(void)setPercent:(float)input
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2211 {
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2212 percent = input;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2213 if(percent > 100.0)
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2214 percent = 100.0;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2215 else if(percent < 0.0)
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2216 percent = 0.0;
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2217 [self resize];
34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2218 }
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2219 -(id)topLeft { return topleft; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2220 -(void)setTopLeft:(id)input
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2221 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2222 topleft = input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2223 [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	2224 [topleft release];
2646 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 -(id)bottomRight { return bottomright; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2227 -(void)setBottomRight:(id)input
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2228 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2229 bottomright = input;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2230 [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	2231 [bottomright release];
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2232 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2233 -(int)type { return splittype; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2234 -(void)setType:(int)input { splittype = input; }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2235 -(void)resize
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 CGRect rect = self.frame;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2238 CGRect half = rect;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2239
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2240 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	2241
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2242 if(splittype == DW_HORZ)
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2243 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	2244 else
2647 34c4cb84834a iOS: Fix a miscalculation during DWSplitBar resize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2646 diff changeset	2245 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	2246 if(topleft)
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2247 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2248 DWBox *view = topleft;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2249 Box *box = [view box];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2250 [topleft setFrame:half];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2251 _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	2252 _dw_handle_resize_events(box);
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2253 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2254 if(splittype == DW_HORZ)
2647 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 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	2257 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	2258 }
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2259 else
2647 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 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	2262 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	2263 }
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2264 if(bottomright)
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2265 {
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2266 DWBox *view = bottomright;
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2267 Box *box = [view box];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2268 [bottomright setFrame:half];
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2269 _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	2270 _dw_handle_resize_events(box);
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2271 }
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	2272 }
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	2273 -(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	2274 {
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 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	2276 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	2277 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	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 [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	2280 [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	2281 }
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 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	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 [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	2285 [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	2286 }
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	2287 [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	2288 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2289 @end
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 /* 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	2292 @interface DWSlider : UISlider
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2293 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2294 void *userdata;
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2295 BOOL vertical;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2296 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2297 -(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	2298 -(BOOL)vertical;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2299 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2300 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2301 -(void)sliderChanged:(id)sender;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2302 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2303
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2304 @implementation DWSlider
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2305 -(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	2306 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2307 if(vert)
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 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	2310 self.transform = trans;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2311 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2312 vertical = vert;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2313 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	2314 -(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	2315 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2316 -(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	2317 -(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	2318 -(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	2319 @end
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 /* 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	2322 @interface DWMLE : UITextView
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2323 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2324 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2327 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2329
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2330 @implementation DWMLE
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2331 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2332 -(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	2333 -(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	2334 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2335
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2336 /* 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	2337 * 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	2338 */
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2339 @interface DWTableViewCell : UITableViewCell
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2340 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2341 NSMutableArray *columndata;
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2342 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	2343 UILabel *label;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2344 UIImageView *image;
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2345 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2346 -(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	2347 -(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	2348 -(UIImageView *)image;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2349 -(UILabel *)label;
2832 df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2350 -(void)columnClicked:(id)sender;
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2351 @end
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2352
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2353 @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	2354 -(id)init {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2355 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	2356
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2357 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	2358 [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	2359 [[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	2360
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2361 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	2362 [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	2363 [[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	2364
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2365 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	2366 [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	2367 [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	2368 [[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	2369
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2370 /* 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	2371 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	2372
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2373 [NSLayoutConstraint activateConstraints:@[
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2374 /* 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	2375 [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	2376 [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	2377 [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	2378 [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	2379 [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	2380 /* 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	2381
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2382 /* 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	2383 [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	2384 /* 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	2385 [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	2386 [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	2387 /* 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	2388 ]];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2389 return self;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2390 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2391 -(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	2392 -(UIImageView *)image { return image; }
2832 df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2393 -(void)columnClicked:(id)sender
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2394 {
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2395 if([sender isMemberOfClass:[UIButton class]])
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2396 {
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2397 id view = [self superview];
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2398
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2399 while(view && [view isKindOfClass:[UITableView class]] == NO)
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2400 view = [view superview];
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2401
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2402 _dw_event_handler(view, DW_INT_TO_POINTER([sender tag]+1), _DW_EVENT_COLUMN_CLICK);
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2403 }
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2404 }
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2405 -(void)setColumnData:(NSMutableArray *)input
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2406 {
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2407 if(columndata != input)
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2408 {
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2409 NSMutableArray *olddata = columndata;
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2410 columndata = input;
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2411 [columndata retain];
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2412 [olddata release];
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2413 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2414 /* 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	2415 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	2416 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2417 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	2418 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	2419 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	2420
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2421 /* 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	2422 [stack setAxis:(extra ? UILayoutConstraintAxisHorizontal : UILayoutConstraintAxisVertical)];
2831 adb0e4ce9347 iOS: Fix multi-line container display, had to stop using buttons for images. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2830 diff changeset	2423 /* For Multi-line, we don't want fill, we want leading */
adb0e4ce9347 iOS: Fix multi-line container display, had to stop using buttons for images. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2830 diff changeset	2424 if(!extra)
adb0e4ce9347 iOS: Fix multi-line container display, had to stop using buttons for images. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2830 diff changeset	2425 [stack setAlignment:UIStackViewAlignmentLeading];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2426
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2427 /* 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	2428 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	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([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	2431 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2432 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	2433
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2434 /* 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	2435 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	2436 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2437 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	2438
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2439 if([oldview isMemberOfClass:(extra ? [UILabel class] : [UIButton class])])
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2440 label = oldview;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2441 else
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2442 [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	2443 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2444 if(!label)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2445 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2446 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	2447
2832 df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2448 [label setTag:index];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2449 [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	2450 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	2451 [label setTextAlignment:NSTextAlignmentCenter];
2832 df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2452 else
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2453 {
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2454 [label addTarget:self action:@selector(columnClicked:)
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2455 forControlEvents:UIControlEventTouchUpInside];
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2456 [label setTitleColor:[UIColor darkTextColor] forState:UIControlStateNormal];
df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2457 }
2830 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(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	2460 [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	2461 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	2462 [stack addArrangedSubview:label];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2463 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2464 /* 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	2465 if(extra)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2466 [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	2467 else
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2468 [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	2469 index++;
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 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	2472 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2473 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	2474
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2475 /* 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	2476 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	2477 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2478 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	2479
2831 adb0e4ce9347 iOS: Fix multi-line container display, had to stop using buttons for images. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2830 diff changeset	2480 if([oldview isMemberOfClass:[UIImageView class]])
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2481 image = oldview;
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2482 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	2483 [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	2484 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2485 if(!image)
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2486 {
2831 adb0e4ce9347 iOS: Fix multi-line container display, had to stop using buttons for images. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2830 diff changeset	2487 image = [[UIImageView alloc] init];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2488
2832 df16bb0a11b2 iOS: Implement DW_SIGNAL_COLUMN_CLICKED for multi-line containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2831 diff changeset	2489 [image setTag:index];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2490 [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	2491
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2492 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	2493 [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	2494 else
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2495 [stack addArrangedSubview:image];
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2496 }
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2497 /* Set the image view or button image */
2831 adb0e4ce9347 iOS: Fix multi-line container display, had to stop using buttons for images. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2830 diff changeset	2498 [image setImage:object];
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2499
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2500 index++;
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2501 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2502 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2503 }
455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	2504 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2505 -(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	2506 -(void)dealloc
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2507 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2508 [columndata release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2509 [image removeFromSuperview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2510 [image release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2511 [label removeFromSuperview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2512 [label release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2513 [stack removeFromSuperview];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2514 [stack release];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2515 [super dealloc];
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2516 }
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2517 @end
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2518
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2519 /* 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	2520 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	2521 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2522 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	2523 [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	2524
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2525 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	2526 [[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	2527 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	2528 [[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	2529 if(columndata)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2530 [browsercell setColumnData:columndata];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2531 return browsercell;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2532 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2533
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2534 /* 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	2535 @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	2536 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2537 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2538 NSMutableArray *tvcols;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2539 NSMutableArray *data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2540 NSMutableArray *types;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2541 NSPointerArray *titles;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2542 NSPointerArray *rowdatas;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2543 UIColor fgcolor, oddcolor, *evencolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2544 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	2545 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	2546 int iLastAddPoint, iLastQueryPoint;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2547 int filesystem;
2612 4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2548 NSTimeInterval lastClick;
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2549 NSInteger lastClickRow;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2550 }
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2551 -(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	2552 -(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	2553 -(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	2554 -(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	2555 -(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	2556 -(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	2557 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2558 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2559 -(void)setFilesystem:(int)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2560 -(int)filesystem;
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2561 -(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	2562 -(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	2563 -(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	2564 -(void)removeRow:(int)row;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2565 -(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	2566 -(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	2567 -(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	2568 -(NSMutableArray *)getColumns;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2569 -(int)cellType:(int)col;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2570 -(int)lastAddPoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2571 -(int)lastQueryPoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2572 -(void)setLastQueryPoint:(int)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2573 -(void)clear;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2574 -(void)setup;
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	2575 -(CGSize)getsize;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2576 -(void)setForegroundColor:(UIColor *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2577 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2578
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2579 @implementation DWContainer
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2580 -(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	2581 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2582 /* 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	2583 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	2584 return [data count];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2585 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2586 }
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2587 -(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	2588 {
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2589 /* 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	2590 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	2591 id celldata = [data objectAtIndex:index];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2592
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2593 /* 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	2594 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	2595 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2596 DWTableViewCell *result = celldata;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2597
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2598 /* 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	2599 * 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	2600 */
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	2601 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	2602 [[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	2603
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2604 /* Return the result */
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2605 return result;
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2606 }
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2607 return nil;
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	2608 }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2609 -(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	2610 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2611 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	2612 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2613 if(evencolor)
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2614 [cell setBackgroundColor:evencolor];
2678 24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2615 else
24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2616 [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	2617 }
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2618 else
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2619 {
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2620 if(oddcolor)
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2621 [cell setBackgroundColor:oddcolor];
2678 24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2622 else
24fb27a1e039 iOS: Make UITableViewCell backgrounds clear if not set explicitly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2674 diff changeset	2623 [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	2624 }
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2625 }
2830 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 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	2627 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2628 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	2629 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	2630 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	2631
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2632 /* 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	2633 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	2634 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	2635 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	2636 }
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2637 -(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	2638 {
cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2639 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	2640 }
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2641 -(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	2642 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2643 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	2644 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	2645 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	2646
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2647 [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	2648 [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	2649 [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	2650 [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	2651
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	2652 _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	2653 _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	2654
2602 cc5013e626f7 iOS: Code cleanup, make sure menu items are enabled on creation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2601 diff changeset	2655 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	2656 {
2600 0bb974e70435 iOS: Fix crash by retaining the UIMenu returned in the block. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2599 diff changeset	2657 __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	2658 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	2659 previewProvider:nil
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2660 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	2661 [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	2662 }
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2663 return config;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	2664 }
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	2665 -(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	2666 -(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	2667 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668 -(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	2669 -(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	2670 -(int)filesystem { return filesystem; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2671 -(void)refreshColors
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2672 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2673 UIColor *oldodd = oddcolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2674 UIColor *oldeven = evencolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2675 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	2676 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	2677 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	2678 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	2679
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2680 /* 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	2681 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	2682 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	2683 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2684 oddcolor = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2685 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	2686 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	2687 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2688 evencolor = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2689 [oldodd release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2690 [oldeven release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2691 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2692 -(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	2693 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2694 /* 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	2695 dw_oddcolor = oddcol;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2696 dw_evencolor = evencol;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2697 [self refreshColors];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2698 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2699 -(void)checkDark
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2700 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2701 /* 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	2702 _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	2703 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	2704 _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	2705 else
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	2706 _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	2707 /* 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	2708 if(titles)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2709 [self refreshColors];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2710 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2711 -(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	2712 -(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	2713 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2714 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2715 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2716 if(index < iLastAddPoint)
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2717 {
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2718 iLastAddPoint++;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2719 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2720 [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	2721 [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	2722 [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	2723 return (int)[titles count];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2724 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2725 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2726 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2727 -(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	2728 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2729 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2730 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2731 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	2732 [data addObject:input];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2733 [titles addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2734 [rowdatas addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2735 return (int)[titles count];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2736 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2737 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2738 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2739 -(int)addRows:(int)number
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2740 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2741 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2742 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2743 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2744
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2745 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	2746
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2747 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	2748 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2749 [data addObject:[NSNull null]];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2750 [titles addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2751 [rowdatas addPointer:NULL];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2752 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2753 return (int)[titles count];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2754 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2755 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2756 }
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2757 -(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	2758 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2759 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2760 {
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2761 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	2762 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2763 if(!input)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2764 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	2765 [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	2766 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2767 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2768 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2769 -(void)removeRow:(int)row
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2770 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2771 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2772 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2773 void *oldtitle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2774
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	2775 [data removeObjectAtIndex:row];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2776 oldtitle = [titles pointerAtIndex:row];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2777 [titles removePointerAtIndex:row];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2778 [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	2779 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	2780 {
d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2781 iLastAddPoint--;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2782 }
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)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	2788 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2789 if(titles && input)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2790 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2791 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	2792 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	2793 [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	2794 if(oldtitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2795 free(oldtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2796 }
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 -(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	2799 -(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	2800 -(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	2801 -(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	2802 -(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	2803 -(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	2804 -(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	2805 -(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	2806 -(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	2807 -(void)clear
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 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2810 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2811 [data removeAllObjects];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2812 while([titles count])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2813 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2814 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	2815 [titles removePointerAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2816 [rowdatas removePointerAtIndex:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2817 if(oldtitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2818 free(oldtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2819 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2820 }
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	2821 iLastAddPoint = 0;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2822 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2823 -(void)setup
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2824 {
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	2825 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	2826 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	2827 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	2828 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	2829 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	2830 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	2831 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	2832 [self checkDark];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2833 }
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	2834 -(CGSize)getsize
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2835 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2836 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	2837
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2838 if(tvcols)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2839 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2840 int colcount = (int)[tvcols count];
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	2841 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	2842 int width = 0;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2843
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2844 if(rowcount > 0)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2845 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2846 int x;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2847
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2848 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	2849 {
2822 0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	2850 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	2851 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	2852
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2853 if([cell imageView])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2854 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2855 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	2856 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	2857 }
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2858 if([cell textLabel])
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2859 {
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	2860 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	2861 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	2862 if(textheight > thisheight)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2863 thisheight = textheight;
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
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2866 cheight += thisheight;
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(thiswidth > width)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2869 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2870 width = thiswidth;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2871 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2872 }
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2873 /* 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	2874 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	2875 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2876 width = 16;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2877 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2878 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2879 if(width)
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2880 cwidth += width;
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2881 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2882 cwidth += 16;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2883 cheight += 16;
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	2884 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	2885 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2886 -(void)setForegroundColor:(UIColor *)input
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2887 {
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2888 UIColor *oldfgcolor = fgcolor;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2889
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2890 fgcolor = input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2891 [fgcolor retain];
2426 6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2892 [oldfgcolor release];
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2893 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2894 -(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	2895 {
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2896 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	2897
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2898 [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	2899 [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	2900
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2901 /* 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	2902 if([self allowsMultipleSelection])
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2903 {
2612 4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2904 NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2905
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2906 /* 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	2907 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	2908 _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	2909 else
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	2910 _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	2911 /* Handler for listbox class */
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	2912 _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	2913 /* Update lastClick for double tap check */
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2914 lastClick = now;
4628c8c34125 iOS: Standardize DWContainer behavior part 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2610 diff changeset	2915 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	2916 }
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2917 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	2918 {
6220f0580088 iOS: DWContainer attempt to get touch and selection handlers working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2425 diff changeset	2919 /* 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	2920 _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	2921 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2922 }
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2923 -(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	2924 {
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2925 if([self allowsMultipleSelection])
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	2926 [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	2927 }
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	2928 -(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	2929 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2930
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2931 /* 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	2932 @interface DWTreeItem : NSObject
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2933 @property(nonatomic, strong) UIImage *icon;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2934 @property(nonatomic, strong) NSString *title;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2935 @property(nonatomic, assign) void *data;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2936 @property(nonatomic, weak) DWTreeItem *parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2937 @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	2938 @property(nonatomic, assign, readonly) NSUInteger levelDepth;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2939 @property(nonatomic, assign, readonly) BOOL isRoot;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2940 @property(nonatomic, assign, readonly) BOOL hasChildren;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2941 @property(nonatomic, assign) BOOL expanded;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2942 -(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	2943 -(void)insertChildAfter:(DWTreeItem *)treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2944 -(void)appendChild:(DWTreeItem *)newChild;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2945 -(void)removeFromParent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2946 -(void)moveToDestination:(DWTreeItem *)destination;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2947 -(BOOL)containsTreeItem:(DWTreeItem *)treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2948 -(NSArray<DWTreeItem > )visibleNodes;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2949 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2950
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2951 @implementation DWTreeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2952 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2953 NSArray *_flattenedTreeCache;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2954 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2955 -(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	2956 -(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	2957 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2958 if(self = [super init])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2959 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2960 _title = [title retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2961 _icon = [icon retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2962 _data = itemdata;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2963 _children = [[NSMutableArray alloc] initWithCapacity:1];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2964 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2965 return self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2966 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2967 -(NSString *)title
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2968 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2969 if(_title)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2970 return _title;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2971 return self.description;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2972 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2973 -(UIImage *)icon
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 if(_icon)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2976 return _icon;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2977 return nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2978 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2979 -(NSArray<DWTreeItem > )visibleNodes
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2980 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2981 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	2982 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	2983 [allElements addObject:self];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2984 if(_expanded)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2985 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2986 for (DWTreeItem *child in _children)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2987 [allElements addObjectsFromArray:[child visibleNodes]];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2988 }
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	2989 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	2990 [_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	2991 _flattenedTreeCache = allElements;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2992 return allElements;
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 -(void)insertChildAfter:(DWTreeItem *)treeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2995 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2996 DWTreeItem *parent = self.parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2997 NSUInteger index = [parent.children indexOfObject:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2998 if(index == NSNotFound)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	2999 index = [parent.children count];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3000 treeItem.parent = parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3001 [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	3002 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3003 -(void)appendChild:(DWTreeItem *)newChild
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 newChild.parent = self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3006 [_children addObject:newChild];
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 -(void)removeFromParent
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3009 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3010 DWTreeItem *parent = self.parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3011 if(parent)
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 [parent.children removeObject:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3014 self.parent = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3015 }
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 -(void)moveToDestination:(DWTreeItem *)destination
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3018 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3019 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	3020 if(self == destination \|\| destination == nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3021 return;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3022 [self removeFromParent];
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 [destination insertChildAfter:self];
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 -(BOOL)containsTreeItem:(DWTreeItem *)treeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3027 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3028 DWTreeItem *parent = treeItem.parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3029 if(parent == nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3030 return NO;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3031 if(self == parent)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3032 return YES;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3033 return [self containsTreeItem:parent];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3034 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3035 -(NSUInteger)levelDepth
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3036 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3037 NSUInteger cnt = 0;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3038 if(_parent != nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3039 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3040 cnt += 1;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3041 cnt += [_parent levelDepth];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3042 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3043 return cnt;
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 -(BOOL)isRoot { return (!_parent); }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3046 -(BOOL)hasChildren { return (_children.count > 0); }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3047 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3048
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3049 @class DWTreeViewCell;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3050 @protocol DWTreeViewCellDelegate <NSObject>
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3051 //@optional
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3052 - (BOOL) queryExpandableInTreeViewCell:(DWTreeViewCell *)treeViewCell;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3053 - (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	3054 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3055
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3056 @interface DWTreeViewCell : UITableViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3057 @property(nonatomic, strong) UILabel *titleLabel;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3058 @property(nonatomic) NSUInteger level;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3059 @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	3060 @property(nonatomic) BOOL children;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3061 @property(nonatomic, assign) id <DWTreeViewCellDelegate> delegate;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3062 -(instancetype)initWithStyle:(UITableViewCellStyle)style
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3063 reuseIdentifier:(NSString *)reuseIdentifier
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3064 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	3065 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	3066 children:(BOOL)children;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3067 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3068
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3069 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	3070 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3071 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	3072 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3073
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3074 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	3075 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	3076
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3077 @implementation DWTreeViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3078 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3079 DWButton *_arrowImageButton;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3080 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3081 -(id)initWithStyle:(UITableViewCellStyle)style
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3082 reuseIdentifier:(NSString *)reuseIdentifier
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3083 level:(NSUInteger)level
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3084 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	3085 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	3086 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3087 // 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	3088 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	3089 return nil;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3090
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3091 self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3092
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3093 if(self)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3094 {
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3095 _level = level - 1;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3096 _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	3097 _children = children;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3098
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3099 UIView *content = self.contentView;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3100
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3101 UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3102 titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3103 titleLabel.numberOfLines = 0;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3104 titleLabel.textAlignment = NSTextAlignmentLeft;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3105 [content addSubview:titleLabel];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3106 _titleLabel = titleLabel;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3107
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3108 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	3109 _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	3110 _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	3111 [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	3112 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	3113 forControlEvents:UIControlEventTouchUpInside];
7ce51a7e8009 iOS: Fix tree control handling clicks on the expand/collapse button. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2793 diff changeset	3114
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3115 [arrowImageButton setType:_DW_BUTTON_TYPE_TREE];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3116 [arrowImageButton setDidCheckedChanged:^(BOOL checked) {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3117 _expanded = checked;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3118 if([_delegate respondsToSelector:@selector(treeViewCell:expanded:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3119 [_delegate treeViewCell:self expanded:checked];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3120 }];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3121 [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	3122 [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	3123 if(!children)
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3124 [arrowImageButton setHidden:YES];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3125 [content addSubview:arrowImageButton];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3126 _arrowImageButton = arrowImageButton;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3127 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3128 return self;
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 #pragma mark -
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3131 #pragma mark Other overrides
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3132 -(void)layoutSubviews
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 [super layoutSubviews];
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 CGSize size = self.contentView.bounds.size;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3137 CGFloat stepSize = size.height;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3138 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	3139 _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	3140
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3141 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	3142 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	3143 _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	3144 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3145 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3146
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3147 @class DWTree;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3148
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3149 @protocol DWTreeViewDelegate <NSObject>
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3150 @required
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3151 -(NSInteger)numberOfRowsInTreeView:(DWTree *)treeView;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3152 -(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	3153 -(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	3154 -(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	3155 -(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	3156 -(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	3157 -(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	3158 -(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	3159 -(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	3160 -(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	3161 @optional
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3162 -(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	3163 -(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	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 @interface DWTree : UITableView
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3167 @property(nonatomic, strong) UIFont *font;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3168 @property(nonatomic, strong) DWTreeItem *treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3169 @property(nonatomic, weak) id<DWTreeViewDelegate> treeViewDelegate;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3170 -(instancetype)initWithFrame:(CGRect)frame;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3171 -(void)insertTreeItem:(DWTreeItem *)treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3172 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3173
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3174 @interface DWTree () <UITableViewDataSource, UITableViewDelegate, DWTreeViewCellDelegate, DWTreeViewDelegate>
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3175 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3176
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3177 @implementation DWTree
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3178 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3179 DWTreeItem *_rootNode;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3180 DWTreeItem *_selectedNode;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3181 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3182 -(instancetype)initWithFrame:(CGRect)frame
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3183 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3184 if(self = [super initWithFrame:frame])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3185 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3186 self.delegate=self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3187 self.dataSource=self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3188 _treeViewDelegate=self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3189 self.separatorStyle= UITableViewCellSeparatorStyleNone;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3190 _font = [UIFont systemFontOfSize:16];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3191 _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	3192 _rootNode.expanded = YES;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3193 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3194 return self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3195 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3196 -(void)dealloc { [_rootNode release]; [super dealloc]; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3197 -(void)insertTreeItem:(DWTreeItem *)treeItem
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3198 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3199 DWTreeItem *targetNode = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3200
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3201 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	3202 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3203 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	3204
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3205 // 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	3206 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	3207 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3208 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	3209 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	3210 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3211 targetNode = iter;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3212 break;
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3213 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3214 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3215 // 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	3216 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	3217 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	3218 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3219 // 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	3220 if(targetNode == nil)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3221 targetNode = _rootNode;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3222 // 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	3223 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	3224 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	3225 [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	3226 else
9b9bc2c2bbad iOS: Skip displaying the root node, it just represents the tree itself. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2765 diff changeset	3227 [targetNode insertChildAfter:treeItem];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3228
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3229 if([_treeViewDelegate respondsToSelector:@selector(treeView:addTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3230 [_treeViewDelegate treeView:self addTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3231
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3232 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3233 [self resetSelection:NO];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3234 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3235 -(void)setFont:(UIFont *)font
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3236 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3237 _font = font;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3238 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3239 [self resetSelection:NO];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3240 }
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3241 -(void)clear
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3242 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3243 [[_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	3244 [self reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	3245 [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	3246 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3247 -(void)resetSelection:(BOOL)delay
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3248 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3249 NSInteger row = NSNotFound;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3250 if([_treeViewDelegate respondsToSelector:@selector(treeView:rowForTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3251 row = [_treeViewDelegate treeView:self rowForTreeItem:_selectedNode];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3252 if(row != NSNotFound)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3253 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3254 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	3255 dispatch_block_t run = ^ {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3256 [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	3257 };
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3258 if(delay)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3259 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	3260 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3261 run();
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3262 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3263 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3264 #pragma mark - DWTreeViewDelegate
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3265 -(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	3266 -(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	3267 -(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	3268 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3269 if(treeItem)
2772 af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3270 {
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3271 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	3272 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	3273
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3274 [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	3275 [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	3276 [params addPointer:treeItem];
af9dc4c2c0df iOS: Use NSPointerArray in all _DW_EVENT_ITEM_SELECT cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2771 diff changeset	3277 _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	3278 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	3279 }
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3280 }
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3281 -(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	3282 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3283 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	3284 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	3285 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	3286 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	3287
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3288 [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	3289 [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	3290 [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	3291 [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	3292
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3293 _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	3294 _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	3295 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	3296
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3297 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	3298 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3299 __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	3300 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	3301 previewProvider:nil
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3302 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	3303 [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	3304 }
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3305 return config;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3306 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3307 -(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	3308 -(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	3309 -(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	3310 -(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	3311 -(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	3312 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3313 if(treeItem)
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3314 _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	3315 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3316 - (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	3317 #pragma mark - UITableViewDataSource
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3318 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { return 1; }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3319 -(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	3320 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3321 NSInteger count = 0;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3322 if([_treeViewDelegate respondsToSelector:@selector(numberOfRowsInTreeView:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3323 count = [_treeViewDelegate numberOfRowsInTreeView:self];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3324 return count;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3325 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3326 -(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	3327 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3328 static NSString *CellIdentifier = @"Cell";
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3329
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3330 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3331 DWTreeViewCell *cell = [[DWTreeViewCell alloc] initWithStyle:UITableViewCellStyleDefault
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3332 reuseIdentifier:CellIdentifier
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3333 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	3334 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	3335 children:[treeItem hasChildren]];
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3336 cell.titleLabel.text = treeItem.title;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3337 cell.imageView.image = treeItem.icon;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3338 cell.titleLabel.font = _font;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3339 //cell.selectionStyle = UITableViewCellSelectionStyleNone;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3340 cell.delegate = self;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3341 return cell;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3342 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3343 -(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	3344 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3345 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3346 if([_treeViewDelegate respondsToSelector:@selector(treeView:canEditTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3347 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	3348 return NO;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3349 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3350 -(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	3351 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3352 DWTreeItem *treeItem = [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3353 if(editingStyle == UITableViewCellEditingStyleDelete)
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 [treeItem removeFromParent];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3356 if([_treeViewDelegate respondsToSelector:@selector(treeView:removeTreeItem:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3357 [_treeViewDelegate treeView:self removeTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3358 if(treeItem.expanded && treeItem.hasChildren)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3359 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3360 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3361 [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3362 [self resetSelection:YES];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3363 } else if (editingStyle == UITableViewCellEditingStyleInsert) {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3364 // 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	3365 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3366 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3367 -(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	3368 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3369 if([fromIndexPath isEqual:toIndexPath])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3370 return;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3371 DWTreeItem *srcNode = [self treeItemForIndexPath:fromIndexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3372 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	3373
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3374 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	3375 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3376 [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	3377
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3378 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	3379 [_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	3380
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3381 [self reloadData];
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3382 [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	3383 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3384 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3385 -(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	3386 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3387 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	3388 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	3389 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	3390 return NO;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3391 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3392 #pragma mark - DWTableViewDelegate
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3393 -(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	3394 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3395 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	3396 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	3397 [_treeViewDelegate treeView:self didSelectForTreeItem:treeItem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3398 _selectedNode = treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3399 }
2770 f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3400 -(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	3401 {
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3402 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	3403 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	3404 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	3405 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	3406
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3407 return config;
f42d78f136b6 iOS: Implement tree context menus and all the signal handler/callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2769 diff changeset	3408 }
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3409 -(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	3410 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3411 DWTreeItem *srcNode = [self treeItemForIndexPath:sourceIndexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3412 DWTreeItem *targetNode = [self treeItemForIndexPath:proposedDestinationIndexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3413 if([srcNode containsTreeItem:targetNode] \|\| srcNode==targetNode)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3414 return sourceIndexPath;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3415 // 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	3416 return proposedDestinationIndexPath;
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 #pragma mark - DWTreeViewCellDelegate
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3419 -(BOOL)queryExpandableInTreeViewCell:(DWTreeViewCell *)treeViewCell
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3420 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3421 BOOL allow = YES;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3422 if([_treeViewDelegate respondsToSelector:@selector(treeView:queryExpandableInTreeItem:)])
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 DWTreeItem *treeItem = [self treeItemForTreeViewCell:treeViewCell];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3425 allow = [_treeViewDelegate treeView:self queryExpandableInTreeItem:treeItem];
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 return allow;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3428 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3429 -(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	3430 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3431 DWTreeItem *treeItem = [self treeItemForTreeViewCell:treeViewCell];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3432 treeItem.expanded = expanded;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3433 if(treeItem.hasChildren)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3434 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3435 [self reloadData];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3436 [self resetSelection:NO];
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 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	3439 [_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	3440 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3441 #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	3442 -(DWTreeItem )treeItemForTreeViewCell:(DWTreeViewCell )treeViewCell
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 NSIndexPath *indexPath = [self indexPathForCell:treeViewCell];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3445 return [self treeItemForIndexPath:indexPath];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3446 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3447 -(DWTreeItem )treeItemForIndexPath:(NSIndexPath )indexPath
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3448 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3449 DWTreeItem *treeItem = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3450 if([_treeViewDelegate respondsToSelector:@selector(treeView:treeItemForRow:)])
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3451 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	3452 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	3453 return treeItem;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3454 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3455 @end
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	3456
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3457 /* 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	3458 @interface DWCalendar : UIDatePicker
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3459 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3460 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3461 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3462 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3463 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3466 @implementation DWCalendar
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3467 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3468 -(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	3469 -(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	3470 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3471
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 /* 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	3473 /* 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	3474 @interface DWStepper : UIStepper
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3475 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476 id textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477 id parent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3478 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3479 -(void)setTextfield:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3480 -(id)textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3481 -(void)setParent:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3482 -(id)parent;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3483 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3484
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3485 @implementation DWStepper
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3486 -(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	3487 -(id)textfield { return textfield; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3488 -(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	3489 -(id)parent { return parent; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3490 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3492 /* 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	3493 @interface DWSpinButton : UIView <UITextFieldDelegate>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3495 void *userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3496 UITextField *textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3497 DWStepper *stepper;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3498 id clickDefault;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3499 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3500 -(id)init;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 -(void *)userdata;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3502 -(void)setUserdata:(void *)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3503 -(UITextField *)textfield;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3504 -(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	3505 -(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	3506 -(void)setClickDefault:(id)input;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3507 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3509 @implementation DWSpinButton
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 -(id)init
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3511 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3512 self = [super init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3513
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3514 if(self)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3515 {
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3516 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	3517 [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	3518 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	3519 [self addSubview:stepper];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3520 [stepper setParent:self];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3521 [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	3522 [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	3523 [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	3524 [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	3525 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3526 return self;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3527 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3528 -(void *)userdata { return userdata; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3529 -(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	3530 -(UITextField *)textfield { return textfield; }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3531 -(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	3532 -(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	3533 {
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	3534 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	3535 [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	3536 [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	3537 _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	3538 }
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3539 -(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	3540 {
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	3541 [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	3542 _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	3543 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 -(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	3545 -(void)dealloc
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3546 {
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3547 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	3548 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	3549 [textfield removeFromSuperview];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3550 [textfield release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3551 [stepper removeFromSuperview];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3552 [stepper release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3553 [super dealloc];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3554 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3555 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3556
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3557 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	3558 @interface DWUserNotificationCenterDelegate : NSObject <UNUserNotificationCenterDelegate>
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3559 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3560
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3561 @implementation DWUserNotificationCenterDelegate
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3562 /* 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	3563 -(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	3564 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3565 completionHandler(UNAuthorizationOptionSound \| UNAuthorizationOptionAlert \| UNAuthorizationOptionBadge);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3566 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3567 /* 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	3568 -(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	3569 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3570 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	3571 unsigned long long handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3572 HWND notification;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3573
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3574 /* 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	3575 [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	3576 [objScanner scanUnsignedLongLong:&handle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 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	3578
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 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	3580 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3581 /* 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	3582 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	3583 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3584 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	3585 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3586 /* 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	3587 _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	3588 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	3589 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3590 completionHandler();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3591 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3592 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3593
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3594 @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	3595 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3596 UIPickerView* pickerView;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3597 NSMutableArray* dataArray;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3598 UIBarStyle toolbarStyle;
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;
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3601 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3602 -(void)setToolbarStyle:(UIBarStyle)style;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3603 -(void)append:(NSString *)item;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3604 -(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	3605 -(void)clear;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3606 -(int)count;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3607 -(NSString *)getTextAtIndex:(int)index;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3608 -(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	3609 -(void)deleteAtIndex:(int)index;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3610 -(int)selectedIndex;
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3611 -(void *)userdata;
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3612 -(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	3613 @end
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3614
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3615 @implementation DWComboBox
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3616 -(id)init
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3617 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3618 self = [super init];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3619 if(self)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3620 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3621 [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	3622
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3623 /* Set UI defaults */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3624 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	3625 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	3626
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3627 /* Setup the arrow image */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3628 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	3629 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	3630 [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	3631 [self setRightView:imageButton];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3632 [self setRightViewMode:UITextFieldViewModeAlways];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3633 [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	3634 selectedIndex = -1;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3635 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3636 return self;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3637 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3638 -(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	3639 -(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	3640 -(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	3641 -(void)clear { [dataArray removeAllObjects]; }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3642 -(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	3643 -(void)selectIndex:(int)index
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3644 {
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3645 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	3646 {
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3647 selectedIndex = index;
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3648 [self setText:[dataArray objectAtIndex:index]];
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3649 }
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	3650 }
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3651 -(NSString *)getTextAtIndex:(int)index
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3652 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3653 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	3654 return [dataArray objectAtIndex:index];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3655 return nil;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3656 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3657 -(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	3658 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3659 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	3660 [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	3661 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3662 -(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	3663 -(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	3664 -(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	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 {
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3668 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	3669 [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	3670 [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	3671 _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	3672 }
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3673 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3674 -(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	3675 -(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	3676 {
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	3677 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	3678 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	3679 return nil;
2432 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)doneClicked:(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 */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3684 [self resignFirstResponder];
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 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	3687 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3688 selectedIndex = -1;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3689 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3690 [self sendActionsForControlEvents:UIControlEventValueChanged];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3691 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3692 -(void)cancelClicked:(id)sender
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3693 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3694 /* 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	3695 [self resignFirstResponder];
2432 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 -(void)showPicker:(id)sender
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3698 {
2738 c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3699 [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	3700
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3701 pickerView = [[UIPickerView alloc] init];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3702 [pickerView setDataSource:self];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3703 [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	3704
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3705 /* 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	3706 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	3707 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3708 [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	3709 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3710 else
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3711 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3712 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	3713 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3714 [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	3715 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3716 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3717
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3718 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	3719 [toolbar setBarStyle:toolbarStyle];
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 /* Space between buttons */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3722 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	3723 target:nil
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3724 action:nil];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3725
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3726 UIBarButtonItem *doneButton = [[UIBarButtonItem alloc]
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3727 initWithTitle:@"Done"
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3728 style:UIBarButtonItemStyleDone
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3729 target:self
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3730 action:@selector(doneClicked:)];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3731
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3732 UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc]
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3733 initWithTitle:@"Cancel"
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3734 style:UIBarButtonItemStylePlain
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3735 target:self
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3736 action:@selector(cancelClicked:)];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3737
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3738 [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	3739 [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	3740
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3741 /* Custom input view */
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3742 [self setInputView:pickerView];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3743 [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	3744 [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	3745 }
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3746 -(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	3747 {
c2387166a414 iOS: Improve the combobox. Trigger the input view when touching the combobox bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2737 diff changeset	3748 [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	3749 [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	3750 return [super becomeFirstResponder];
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3751 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3752 -(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	3753 -(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	3754 -(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	3755 -(void)dealloc
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3756 {
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3757 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	3758 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	3759 [dataArray release];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3760 [super dealloc];
a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	3761 }
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3762 @end
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	3763
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3764 /* 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	3765 * 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	3766 * 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	3767 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 @interface DWMDI : DWBox {}
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3770
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 @implementation DWMDI
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772 @end
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3774 /* 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	3775 */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3776 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	3777 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	3778 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	3779
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3780 new->message = message;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3781 new->window = window;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782 new->id = msgid;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783 new->signalfunction = signalfunction;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3784 new->discfunction = discfunc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3785 new->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3786 new->next = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3787
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3788 if (!DWRoot)
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3789 DWRoot = new;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3790 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3791 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	3792 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	3793 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3794 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 if(tmp->message == message &&
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3796 tmp->window == window &&
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 tmp->id == msgid &&
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798 tmp->signalfunction == signalfunction)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3799 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 tmp->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3801 free(new);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3804 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3805 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3806 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3807 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3808 prev->next = new;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3809 else
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3810 DWRoot = new;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3811 }
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3814 /* 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	3815 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	3816 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3817 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3818
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3819 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	3820 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3821 if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3822 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	3823 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 return 0L;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3825 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3826
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	3827 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	3828
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3829 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	3830 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3831 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3832
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3833 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	3834 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3835 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	3836
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	3837 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	3838 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 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	3840
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3841 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3843 _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	3844 }
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 else
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 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	3849 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3850 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	3851 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	3852 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	3853
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3854 /* Eliminate duplicate configure requests */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3855 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	3856 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3857 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	3858 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3859 [render setSize:newsize];
2622 07c504257e42 iOS: Switch to using internal event message constants. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2616 diff changeset	3860 _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	3861 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3862 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3863 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3864 /* 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	3865 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	3866 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3867 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	3868 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	3869
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	3870 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	3871 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3872 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	3873
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3874 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	3875 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	3876 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	3877 _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	3878 }
2372 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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3881 /* 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	3882 * 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	3883 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 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	3885 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886 DWScrollBox scrollbox = (DWScrollBox )handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	3887 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	3888 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	3889 Box *thisbox = [contentbox box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3890
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3891 /* 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	3892 _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	3893 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3894 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3895 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3896 }
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 /* 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	3899 * 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	3900 */
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	3901 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	3902 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3903 /* Current item position */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3904 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	3905 /* 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	3906 * 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	3907 * 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	3908 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3909 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	3910 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	3911
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 /* Reset the box sizes */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3913 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	3914
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3915 /* 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	3916 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	3917 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3918 int itempad, itemwidth, itemheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3919
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	3920 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	3921 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3922 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	3923 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	3924
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927 /* 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	3928 if(pass == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3929 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3930 (*depth)++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3932 /* 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	3933 _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	3934
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3935 /* 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	3936 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	3937 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	3938
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3939 /* 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	3940 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	3941 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	3942 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	3943 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	3944
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3945 (*depth)--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3946 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3947 }
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3950 /* 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	3951 * 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	3952 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3953 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	3954 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	3955 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	3956
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3957 /* 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	3958 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	3959 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960 if(itemwidth > uxmax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3961 uxmax = itemwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962
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].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	3964 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965 if(itemwidth > upxmax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 upxmax = itemwidth;
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(itempad > upxmax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3971 upxmax = itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3972 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 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	3974 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	3975 thisbox->usedpady += itemheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3976 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3977 thisbox->usedpady += itempad;
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 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3980 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3981 if(itemheight > uymax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3982 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	3983 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	3984 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985 if(itemheight > upymax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3986 upymax = itemheight;
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 else
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 if(itempad > upymax)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3991 upymax = itempad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3992 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3993 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	3994 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	3995 thisbox->usedpadx += itemwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3996 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3997 thisbox->usedpadx += itempad;
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 }
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 /* 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	4002 thisbox->minwidth += uxmax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4003 thisbox->minheight += uymax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 thisbox->usedpadx += upxmax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4005 thisbox->usedpady += upymax;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4007 /* 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	4008 if(pass > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4009 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4010 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	4011 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4012 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	4013 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	4014 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	4015 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	4016
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4017 /* 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	4018 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	4019 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4020 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	4021 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4022 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	4023
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024 if(expandablex)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4025 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	4026 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028 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	4029 }
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	4030 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	4031 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 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	4033 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 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	4035
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4036 if(expandabley)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 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	4038 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4039 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040 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	4041 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4042
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4043 /* 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	4044 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	4045 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4046 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	4047 id handle = thisbox->items[z].hwnd;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4048 CGRect rect;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4049
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4050 rect.origin.x = currentx + pad;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4051 rect.origin.y = currenty + pad;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4052 rect.size.width = width;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4053 rect.size.height = height;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4054 [handle setFrame:rect];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4056 /* 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	4057 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	4058 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4059 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	4060 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	4061
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4062 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4063 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4064 (*depth)++;
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4065 _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	4066 (*depth)--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4067 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4068 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4069
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4070 /* 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	4071 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	4072 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4073 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	4074 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	4075
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 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	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 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	4079 {
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4080 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	4081
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4082 /* 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	4083 [[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	4084 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	4085 [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	4086 [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	4087 }
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4088 }
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4089
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	4090 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	4091 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4092 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	4093
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4094 /* 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	4095 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	4096 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4097 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	4098 /* 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	4099 * 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	4100 */
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4101 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	4102 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	4103 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	4104 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	4105 [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	4106 _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	4107 _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	4108 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4109 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4110 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4111 /* 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	4112 * 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	4113 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4114 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	4115 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4116 int depth = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4117 DWScrollBox scrollbox = (DWScrollBox )handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4118 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4119 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	4120 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	4121 /* 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	4122 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	4123
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4124 /* 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	4125 _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	4126
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	4127 /* 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	4128 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	4129 {
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	4130 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	4131 }
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	4132 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	4133 {
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	4134 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	4135 }
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	4136 [scrollbox setContentSize:frame.size];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4137 [contentbox setFrame:frame];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4138
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4139 /* 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	4140 _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	4141 _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	4142 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4143 /* 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	4144 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	4145 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4146 DWSpinButton spinbutton = (DWSpinButton )handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4147 UITextField *textfield = [spinbutton textfield];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4148 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	4149 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	4150 [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	4151 [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	4152 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4153 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	4154 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4155 DWSplitBar split = (DWSplitBar )handle;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	4156 [split resize];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4157 }
2700 246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4158 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	4159 {
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4160 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	4161
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	4162 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	4163 [[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	4164 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4165
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4166 /* 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	4167 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	4168 currentx += width + (pad * 2);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 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	4170 currenty += height + (pad * 2);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 }
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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4174 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	4176 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	4177 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4178 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	4179 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4180 if(thisbox)
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 int depth = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4183
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4184 /* 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	4185 _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	4186
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4187 /* 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	4188 _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	4189 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4190 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4191 }
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 * 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	4195 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4196 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	4197 {
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4198 /* 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	4199 * 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	4200 * 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	4201 */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4202 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	4203 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4204
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206 * 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	4207 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208 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	4209 {
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	4210 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	4211 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4214 * 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	4215 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4216 * 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	4217 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4218 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	4219 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4220 DWTID curr = pthread_self();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4222 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	4223 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224 DWTID orig = DWThread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4225 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	4226
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 if(orig == (DWTID)-1)
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 DWThread = curr;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 }
2648 2362cb4b7ef9 iOS: Fix another _dw_main_iteration() loop issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2647 diff changeset	4231 /* Process any pending events */
2362cb4b7ef9 iOS: Fix another _dw_main_iteration() loop issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2647 diff changeset	4232 _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	4233 if(orig == (DWTID)-1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4234 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4235 DWThread = orig;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4236 }
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 else
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 usleep(milliseconds * 1000);
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 }
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 /* 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	4245 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	4246 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	4247 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	4248 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4249
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4250 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4251 * 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	4252 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4253 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	4254 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4255 DWTID curr = pthread_self();
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 if(DWThread == (DWTID)-1)
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 DWThread = curr;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 _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	4261 DWThread = (DWTID)-1;
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 else if(DWThread == curr)
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 _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	4266 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4268
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 * 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	4271 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 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	4273 {
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 * 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	4278 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 * 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	4280 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 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	4282 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4283 dw_shutdown();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 exit(exitcode);
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 * 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	4289 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4290 * 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	4291 * 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	4292 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4293 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	4294 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295 free(ptr);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4297
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4298 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4299 * 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	4300 * 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	4301 * OS/2 and Windows).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4303 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	4304 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4305 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	4306
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4307 if(!_user_dir[0])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4308 {
2787 56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4309 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	4310 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	4311 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	4312 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	4313
56312f9c1d6c iOS: Return the Application Sandbox's Documents folder from dw_user_dir() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2786 diff changeset	4314 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	4315 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	4316 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	4317 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	4318 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319 strcpy(_user_dir, "/");
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 return _user_dir;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 * 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	4326 * private application data directory.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4327 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4328 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	4329 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330 return _dw_bundle_path;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4331 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4333 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 * 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	4335 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4336 * 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	4337 * 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	4338 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4339 * 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	4340 * 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	4341 * 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	4342 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 * 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	4344 * 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	4345 * 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	4346 * 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	4347 * 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	4348 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4349 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	4350 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351 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	4352 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4353 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4356 * 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	4357 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4358 * 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	4359 * ...: 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	4360 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4361 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	4362 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4363 va_list args;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4364 char outbuf[1025] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4366 va_start(args, format);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4367 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	4368 va_end(args);
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 NSLog(@"%s", outbuf);
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4374 * 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	4375 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376 * 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	4377 * 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	4378 * 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	4379 * ...: 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	4380 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4381 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	4382 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4383 NSInteger iResponse;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4384 NSString *button1 = @"OK";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4385 NSString *button2 = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4386 NSString *button3 = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4387 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	4388 NSString *mtext;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4389 UIAlertControllerStyle mstyle = UIAlertControllerStyleAlert;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4390 NSArray *params;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4391 va_list args;
2725 2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4392 static int in_mb = FALSE;
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4393
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4394 /* Prevent recursion */
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4395 if(in_mb)
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4396 return 0;
2dd68d2810ca iOS: dw_messagebox() can't be called recursively... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2723 diff changeset	4397 in_mb = TRUE;
2372 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 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	4400 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4401 button2 = @"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 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	4404 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4405 button1 = @"Yes";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4406 button2 = @"No";
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 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	4409 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4410 button1 = @"Yes";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4411 button2 = @"No";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4412 button3 = @"Cancel";
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4413 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4414
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4415 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	4416 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	4417 va_end(args);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4418
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 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	4420 [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	4421 in_mb = FALSE;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 iResponse = [[params lastObject] integerValue];
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 switch(iResponse)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4425 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4426 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	4427 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	4428 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4429 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	4430 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4431 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	4432 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	4433 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	4434 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4435 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	4436 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4437 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	4438 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	4439 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	4440 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4442 }
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 * 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	4446 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4447 * 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	4448 * 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	4449 * ext: Default file extention.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4450 * 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	4451 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4452 * 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	4453 * 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	4454 *
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4455 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4456 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	4457 {
2415 f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4458 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	4459 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	4460
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4461 [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	4462 [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	4463 [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	4464 [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	4465 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	4466 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	4467
f33a81fa29e9 iOS: Implment dw_file_browse() and fix issues in dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2414 diff changeset	4468 return file;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4470
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4471 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 * 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	4473 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474 * None.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4475 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4476 * 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	4477 * be converted to text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4478 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4479 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	4480 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4481 UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4482 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	4483 if(str != nil)
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4484 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	4485 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4486 }
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 * 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	4490 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4491 * Text.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4492 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4493 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	4494 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4495 UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4496
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	4497 [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	4498 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4499
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4502 * 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	4503 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4504 * 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	4505 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4506 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	4507 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4508 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	4509
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4510 if(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4511 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4512 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	4513 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	4514 tmp->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4515 tmp->done = FALSE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4516 tmp->result = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4517 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4518 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4519 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4520
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4521 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4522 * 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	4523 * 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	4524 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4525 * 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	4526 * 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	4527 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4528 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	4529 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4530 dialog->result = result;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4531 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	4532 dialog->done = TRUE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4533 return 0;
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
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 * 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	4538 * 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	4539 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 * 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	4541 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4542 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	4543 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4544 void *tmp = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4545
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4546 if(dialog)
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 while(!dialog->done)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4549 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4550 _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	4551 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4552 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	4553 tmp = dialog->result;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4554 free(dialog);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4555 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4556 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4557 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4560 * 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	4561 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4562 * 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	4563 * 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	4564 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4565 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	4566 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	4567 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	4568 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	4569 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4570 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	4571 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	4572 Box *newbox = [view box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4573 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	4574 newbox->pad = pad;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4575 newbox->type = type;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4576 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	4577 }
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 * 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	4581 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4582 * 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	4583 * 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	4584 * 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	4585 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4586 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	4587 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	4588 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	4589 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4590
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4591 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4592 * 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	4593 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4594 * 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	4595 * 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	4596 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4597 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	4598 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	4599 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	4600 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	4601 {
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	4602 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	4603 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	4604 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	4605 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	4606 [scrollbox setBox:box];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4607 [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	4608 [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	4609 [tmpbox release];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	4610 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	4611 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4614 * 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	4615 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4616 * 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	4617 * 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	4618 */
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4619 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	4620 DW_FUNCTION_ADD_PARAM2(handle, orient)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4621 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	4622 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	4623 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4624 DWScrollBox *scrollbox = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4625 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4626 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	4627 CGSize contentsize = [scrollbox contentSize];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4628 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	4629 int range = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4630 int val = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4631 if(orient == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4632 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4633 range = [view bounds].size.height - contentsize.height;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4634 val = contentoffset.y;
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 else
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 range = [view bounds].size.width - contentsize.width;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4639 val = contentoffset.x;
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4640 }
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4641 if(val > range)
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4642 {
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4643 val = range;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4644 }
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4645 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	4646 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4649 * 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	4650 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4651 * 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	4652 * 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	4653 */
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4654 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	4655 DW_FUNCTION_ADD_PARAM2(handle, orient)
206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4656 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	4657 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	4658 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4659 DWScrollBox *scrollbox = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4660 NSArray *subviews = [scrollbox subviews];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4661 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	4662 int range = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4663 if(orient == DW_VERT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4664 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4665 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	4666 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4667 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4668 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4669 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	4670 }
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4671 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	4672 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4673
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4674 /* 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	4675 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	4676 {
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:[DWButton class]])
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4678 {
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4679 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	4680 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	4681 }
4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4682 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	4683 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4684 DWSpinButton *spinbutton = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4685 object = [spinbutton textfield];
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 #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	4688 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	4689 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4690 NSBox *box = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4691 id content = [box contentView];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4692
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	4693 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	4694 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4695 object = content;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4696 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4697 }
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4698 #endif
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4699 return object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4700 }
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 /* 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	4703 * 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	4704 *
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4705 * Render/Unspecified: 1x1
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4706 * 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	4707 * 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	4708 * Spinbutton: 50x(maxfontheight)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4709 * 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	4710 * 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	4711 * 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	4712 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4713 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	4714 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4715 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	4716 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	4717 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	4718
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4719 /* 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	4720 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	4721 {
9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4722 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	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(image)
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4725 {
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4726 /* 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	4727 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	4728 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	4729 /* 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	4730 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	4731 }
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4732 /* 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	4733 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	4734
4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	4735 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	4736 {
2423 b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4737 /* 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	4738 * 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	4739 */
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4740 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	4741 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	4742 else
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4743 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	4744 extraheight += 4;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4745 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4746 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4747 /* 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	4748 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	4749 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4750 UIFont *font = [object font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4751
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4752 if([object isEditable])
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4753 {
2430 e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4754 /* 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	4755 if([handle isMemberOfClass:[DWSpinButton class]])
2430 e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4756 thiswidth = 50;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4757 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4758 thiswidth = 150;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4759 }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4760 nsstr = [object text];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4761
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4762 if(font)
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4763 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	4764
2430 e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4765 /* Spinbuttons need some extra */
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4766 if([handle isMemberOfClass:[DWSpinButton class]])
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4767 {
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4768 DWSpinButton *spinbutton = handle;
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4769 CGSize size = [[spinbutton stepper] intrinsicContentSize];
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4770
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4771 /* Add the stepper width as extra... */
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4772 extrawidth = size.width;
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4773 /* 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	4774 if(size.height > thisheight)
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4775 thisheight = size.height;
e08968d21d45 iOS: Additional code to calculate spinbutton size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2429 diff changeset	4776 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4777 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4778 /* 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	4779 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	4780 [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	4781 {
2541 2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4782 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	4783 {
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4784 thiswidth = 25;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4785 thisheight = 100;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4786 }
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4787 else
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4788 {
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4789 thiswidth = 100;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4790 thisheight = 25;
2ee4df2c50bf iOS: Changes to handle autosizing vertical sliders/scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2540 diff changeset	4791 }
2372 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 /* 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	4794 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	4795 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4796 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	4797
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4798 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	4800 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	4801 thiswidth = (int)size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4802 thisheight = (int)size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4803 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4804 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 /* 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	4806 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	4807 {
2588 8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4808 DWCalendar *calendar = object;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4809 CGSize size = [calendar intrinsicContentSize];
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 /* 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	4812 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	4813 {
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4814 if(DWOSMajor >= 14)
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 /* 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	4817 thiswidth = 200;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4818 thisheight = 200;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4819 }
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4820 else
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4821 {
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4822 /* 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	4823 thiswidth = 200;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4824 thisheight = 100;
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4825 }
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4826 }
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4827 else
8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4828 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4829 thiswidth = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4830 thisheight = size.height;
2588 8253e17b20ad iOS: Remove some bogus secondary color code in DWBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2587 diff changeset	4831 }
2372 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 /* 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	4834 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	4835 [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	4836 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	4837 CGSize size;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4838
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4839 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	4840 size = [object contentSize];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4841 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4842 size = [object getsize];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4843
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4844 thiswidth = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4845 thisheight = size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4846
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4847 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	4848 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	4849 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	4850 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	4851 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	4852 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	4853 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	4854 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	4855 }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4856 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	4857 {
2413 8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	4858 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	4859 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	4860 }
2428 9c5b95d66fc8 iOS: Make spin buttons actually function. Fix layout and autosizing issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2427 diff changeset	4861 #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	4862 /* 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	4863 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	4864 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	4865 #endif
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4866
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4867 /* 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	4868 * 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	4869 */
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	4870 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	4871 {
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4872 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	4873
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	4874 /* 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	4875 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	4876
b4cb136b5222 iOS: Special handling for combined text/image buttons like check and radio bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2422 diff changeset	4877 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	4878 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	4879 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	4880 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	4881 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4882
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4883 /* Set the requested sizes */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4884 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4885 *width = thiswidth + extrawidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887 *height = thisheight + extraheight;
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 /* 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	4891 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	4892 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 id object = box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 DWBox *view = box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4895 DWBox *this = item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4896 Box *thisbox;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4897 int z, x = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4898 Item tmpitem, thisitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4900 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4901 * 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	4902 * 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	4903 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904 if(box == item)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 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	4907 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910 /* Query the objects */
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4911 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	4912 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 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	4914 NSArray *subviews = [[[window rootViewController] view] subviews];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	4915 view = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4916 }
2472 206a0643add6 iOS: Move scrollbox functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2467 diff changeset	4917 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	4918 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4919 DWScrollBox *scrollbox = box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4920 view = [scrollbox box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4921 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4922
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923 thisbox = [view box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925 object = item;
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 /* 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	4928 if(!thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4929 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4930 if(index < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4931 index = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4932 if(index > thisbox->count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4933 index = thisbox->count;
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 /* Duplicate the existing data */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4936 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	4937
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 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	4939 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940 if(z == index)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4941 x++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 tmpitem[x] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4943 x++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4945
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4946 /* Sanity checks */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4947 if(vsize && !height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4948 height = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4949 if(hsize && !width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4950 width = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4951
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4952 /* 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	4953 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	4954 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	4955 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	4957 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	4958 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	4959 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	4960 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	4961
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	4962 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	4963 }
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 tmpitem[index].hwnd = item;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966 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	4967 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	4968 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	4969 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	4970 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	4971
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	4972 /* 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	4973 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	4974 _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	4975
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4976 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4977
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4978 /* Update the item count */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 thisbox->count++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 /* 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	4982 [view addSubview:this];
2817 5000a8a43825 iOS: Fix some memory leaks and remove unnecessary code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2813 diff changeset	4983 [this release];
5000a8a43825 iOS: Fix some memory leaks and remove unnecessary code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2813 diff changeset	4984
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4985 /* 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	4986 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	4987 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4988 DWButton button = (DWButton )this;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4989
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4990 /* 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	4991 * 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	4992 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4993 [button setParent:view];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4994 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4995 /* 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	4996 _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	4997
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 /* Free the old data */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4999 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5001 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5002
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 * 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	5005 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5006 * 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	5007 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5008 * 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	5009 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5010 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	5011 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	5012 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	5013 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	5014 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5015 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5017 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5018 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	5019
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020 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	5021 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022 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	5023
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5024 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	5025 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 id window = [object window];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5028 int z, index = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5029 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	5030
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5031 if(!thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5032 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5033
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5034 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	5035 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5036 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	5037 index = z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5038 }
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 if(index == -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5041 retval = DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5042 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5043 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 [object retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 [object removeFromSuperview];
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 if(thisbox->count > 1)
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 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	5050
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5051 /* 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	5052 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	5053 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054 tmpitem[z] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5056 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	5057 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5058 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	5059 }
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 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 if(tmpitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 thisbox->count--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 /* 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	5070 _dw_redraw(window, TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5073 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5075 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	5076 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5077
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 * 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	5080 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5081 * 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	5082 * 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	5083 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5084 * 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	5085 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 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	5087 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	5088 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	5089 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	5090 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5091 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5092 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5093 DWBox parent = (DWBox )box;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5094 id object = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5095
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5096 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	5097 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 id window = [parent window];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5101 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	5102 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5103 int z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5104 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	5105
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5106 object = thisitem[index].hwnd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5107
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5108 if(object)
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 [object retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5111 [object removeFromSuperview];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 }
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 if(thisbox->count > 1)
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 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	5117
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 /* 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	5119 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	5120 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 tmpitem[z] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5123 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	5124 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5125 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	5126 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 }
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 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5130 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5131 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5132 if(tmpitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5133 thisbox->count--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5134 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5135 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5136
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5137 /* 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	5138 _dw_redraw(window, TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5139 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5140 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5141 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5142 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	5143 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5144
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5145 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5146 * 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	5147 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5148 * 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	5149 * 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	5150 * 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	5151 * 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	5152 * 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	5153 * 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	5154 * 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	5155 * 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	5156 */
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	5157 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	5158 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	5159 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	5160 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	5161 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 _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	5163 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	5164 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5165
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5166 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5167 * 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	5168 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5169 * 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	5170 * 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	5171 * 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	5172 * 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	5173 * 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	5174 * 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	5175 * 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	5176 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5177 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	5178 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	5179 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	5180 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	5181 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5182 /* 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	5183 * 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	5184 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5185 _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	5186 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	5187 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5189 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5190 * 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	5191 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5192 * 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	5193 * 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	5194 * 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	5195 * 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	5196 * 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	5197 * 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	5198 * 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	5199 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	5200 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	5201 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	5202 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	5203 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	5204 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 _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	5206 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	5207 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5209 /* 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	5210 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	5211 {
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5212 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	5213 if(text)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5214 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5215 [button setTitle:[NSString stringWithUTF8String:text] forState:UIControlStateNormal];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5216 }
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5217 [button addTarget:button
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5218 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	5219 forControlEvents:UIControlEventTouchUpInside];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5220 [button setTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 if(DWDefaultFont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5223 [[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	5224 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5225 return button;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5226 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5227
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5228 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5229 * 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	5230 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5231 * 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	5232 * 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	5233 */
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	5234 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	5235 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	5236 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	5237 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	5238 {
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5239 DWButton *button = _dw_internal_button_new(text, cid, UIButtonTypeSystem);
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5240 [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	5241 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	5242 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5243
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5244 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5245 * 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	5246 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5247 * 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	5248 * 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	5249 */
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	5250 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	5251 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	5252 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	5253 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	5254 {
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	5255 DWEntryField *entry = [[[DWEntryField alloc] init] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5256 [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	5257 [entry setTag:cid];
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5258 [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	5259 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	5260 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5262 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5263 * 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	5264 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5265 * 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	5266 * 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	5267 */
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	5268 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	5269 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	5270 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	5271 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	5272 {
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	5273 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	5274 [entry setSecureTextEntry:YES];
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5275 [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	5276 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	5277 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5278
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5280 * 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	5281 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5282 * 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	5283 * 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	5284 */
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5285 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	5286 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	5287 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	5288 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	5289 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290 DWEntryField *entry = handle;
2704 ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5291
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5292 [entry setMaximumLength:limit];
ae846e9f1ead iOS: Implement dw_entryfield_set_limit() using delegate method. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2700 diff changeset	5293 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	5294 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 * 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	5298 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 * 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	5300 * 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	5301 */
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	5302 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	5303 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	5304 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	5305 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	5306 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5307 NSBundle *bundle = [NSBundle mainBundle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5308 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	5309 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	5310 UIImage *image = [[UIImage alloc] initWithContentsOfFile:filepath];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5311 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	5312 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5313 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5314 [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	5315 [image release];
76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5316 }
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	5317 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	5318 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5319
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5320 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5321 * 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	5322 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5323 * 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	5324 * 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	5325 * 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	5326 * 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	5327 * (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	5328 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	5329 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	5330 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	5331 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	5332 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	5333 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5334 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	5335
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5336 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	5337 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	5338
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5339 if(!image && ext)
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 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	5342 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	5343 }
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5344 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	5345 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5347 [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	5348 [image release];
76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5349 }
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	5350 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	5351 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5352
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5353 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5354 * 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	5355 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5356 * 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	5357 * 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	5358 * 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	5359 * (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	5360 * len: length of str
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5361 */
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	5362 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	5363 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	5364 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	5365 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	5366 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5367 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	5368 UIImage *image = [[UIImage alloc] initWithData:thisdata];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5369 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	5370 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5372 [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	5373 [image release];
76d876c441c9 iOS: Minor code cleanup in the bitmap button image handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2648 diff changeset	5374 }
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	5375 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	5376 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5377
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5379 * 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	5380 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5381 * 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	5382 * 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	5383 */
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	5384 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	5385 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	5386 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	5387 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	5388 {
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	5389 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	5390 UIStepper *stepper = [spinbutton stepper];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5391 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	5392 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	5393
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5394 [stepper setStepValue:1];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5395 [stepper setTag:cid];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5396 [stepper setMinimumValue:-65536];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5397 [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	5398 [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	5399 [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	5400 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	5401 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5404 * Sets the spinbutton value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5405 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5406 * 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	5407 * 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	5408 */
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	5409 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	5410 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	5411 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	5412 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	5413 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5414 DWSpinButton *spinbutton = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5415 UIStepper *stepper = [spinbutton stepper];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5416 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	5417 [stepper setValue:(float)position];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5418 [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	5419 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	5420 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5421
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 * Sets the spinbutton limits.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5425 * 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	5426 * upper: Upper limit.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5427 * lower: Lower limit.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 */
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	5429 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	5430 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	5431 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	5432 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	5433 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5434 DWSpinButton *spinbutton = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435 UIStepper *stepper = [spinbutton stepper];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5436 [stepper setMinimumValue:(double)lower];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5437 [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	5438 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	5439 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5440
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5441 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442 * 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	5443 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5444 * 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	5445 */
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	5446 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	5447 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	5448 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	5449 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	5450 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5451 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	5452 long retval;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5453 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	5454 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	5455 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	5456 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5457
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5458 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5459 * 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	5460 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5461 * 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	5462 * 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	5463 */
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	5464 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	5465 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	5466 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	5467 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	5468 {
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5469 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	5470 [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	5471 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	5472 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5473
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5475 * 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	5476 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5477 * 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	5478 * 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	5479 * 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	5480 */
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5481 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	5482 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	5483 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	5484 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	5485 {
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	5486 DWSlider *slider = [[[DWSlider alloc] init] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5487 [slider setMaximumValue:(double)increments];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5488 [slider setMinimumValue:0];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5489 [slider setContinuous:YES];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	5490 [slider addTarget:slider
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	5491 action:@selector(sliderChanged:)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	5492 forControlEvents:UIControlEventValueChanged];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5493 [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	5494 [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	5495 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	5496 }
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 * 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	5500 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 * 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	5502 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 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	5504 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5505 DWSlider *slider = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5506 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	5507 return (int)val;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5508 }
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 * Sets the slider position.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5512 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5513 * 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	5514 * 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	5515 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5516 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	5517 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5518 DWSlider *slider = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5519 [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	5520 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5521
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5522 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5523 * 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	5524 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5525 * 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	5526 * 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	5527 * 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	5528 */
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	5529 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	5530 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	5531 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	5532 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	5533 {
2718 2987bf90c7c9 iOS: Hide the UISlider track when using them as scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2712 diff changeset	5534 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	5535 [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	5536 [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	5537 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	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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5541 * 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	5542 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 * 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	5544 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5545 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	5546 {
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5547 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	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 position.
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 * 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	5555 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 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	5557 {
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5558 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	5559 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5560
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 * Sets the scrollbar range.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5563 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5564 * 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	5565 * range: Maximum range value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5566 * 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	5567 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5568 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	5569 {
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5570 DWSlider *slider = handle;
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	5571 [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	5572 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5573
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5574 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5575 * 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	5576 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5577 * 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	5578 */
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	5579 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	5580 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	5581 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	5582 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	5583 {
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	5584 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	5585 [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	5586 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	5587 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 * 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	5591 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 * 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	5593 * 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	5594 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5595 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	5596 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	5597 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	5598 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	5599 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5600 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 DWPercent *percent = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 /* Handle indeterminate */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5604 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	5605 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5606 [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	5607 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5608 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5609 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5610 /* Handle normal */
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5611 [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	5612 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5613 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5615
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5616 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5617 * 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	5618 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5619 * 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	5620 * 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	5621 */
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	5622 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	5623 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	5624 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	5625 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	5626 {
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	5627 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	5628 [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	5629 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	5630 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 * 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	5634 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 * 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	5636 */
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5637 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	5638 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	5639 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	5640 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	5641 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 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	5643 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	5644
2700 246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	5645 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	5646 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	5647 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	5648 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5649
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5650 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5651 * 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	5652 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653 * 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	5654 * 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	5655 */
2422 4a353a83b2e4 iOS: Initial attempt at implementing check and radio boxes using SF Symbols. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2421 diff changeset	5656 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	5657 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	5658 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	5659 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	5660 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5661 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	5662 [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	5663 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	5664 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5665
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5666 /* 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	5667 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	5668 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	5669 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	5670
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671 [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	5672 [cont setDataSource:cont];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 [cont setDelegate:cont];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5674 [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	5675 [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	5676 [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	5677 [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	5678 return cont;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5679 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 * 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	5683 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5684 * 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	5685 * 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	5686 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687 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	5688 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	5689 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	5690 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	5691 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5692 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5693 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	5694 [cont setup];
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	5695 [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	5696 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	5697 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5700 * 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	5701 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5702 * 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	5703 * 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	5704 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5705 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	5706 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	5707 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	5708 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	5709 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5713 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	5714 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5715 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5716
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5717 [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	5718 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5719 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	5720 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722 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	5723
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5724 [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	5725 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5726 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5729 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5730
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 * 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	5733 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5734 * 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	5735 * 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	5736 * 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	5737 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5738 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	5739 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	5740 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	5741 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	5742 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5743 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5744 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5745
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5746 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	5747 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5748 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5749
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5750 [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	5751 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5752 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	5753 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5754 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5755 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	5756
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5757 [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	5758 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5759 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5760 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5761 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5762 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5763
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 * 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	5766 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 * 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	5768 * 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	5769 * 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	5770 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 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	5772 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	5773 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	5774 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	5775 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5776 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5777 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5778
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5779 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	5780 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5781 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5782 int z;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5783
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5784 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	5785 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5786 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	5787
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5788 [combo append:nstr];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5789 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5790 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5791 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	5792 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794 int z;
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 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	5797 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 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	5799
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5800 [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	5801 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5803 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5804 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5805 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5808 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5809 * 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	5810 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811 * 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	5812 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5813 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	5814 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	5815 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	5816 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	5817 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5818 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5819 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5820
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5821 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	5822 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5823 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5824
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5825 [combo clear];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5826 }
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5827 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	5828 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831 [cont clear];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5833 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5838 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5839 * 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	5840 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5841 * 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	5842 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5843 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	5844 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	5845 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	5846 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	5847 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5848 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5849 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5850 int result = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5851
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5852 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	5853 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5854 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5855
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5856 result = [combo count];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5857 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5858 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	5859 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5860 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	5861 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	5862 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5863 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	5864 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867 * 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	5868 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5869 * 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	5870 * 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	5871 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5872 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	5873 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	5874 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	5875 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	5876 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5877 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5878 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5879
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	5880 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	5881 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 DWContainer *cont = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5883 NSIndexPath *myIP = [NSIndexPath indexPathForRow:top inSection:0];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5884
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5885 [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	5886 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5887 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5888 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5889
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5890 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5891 * 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	5892 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5893 * 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	5894 * 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	5895 * 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	5896 * 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	5897 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5898 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	5899 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	5900 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	5901 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	5902 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5904 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5905
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5906 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	5907 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5908 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5909 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	5910
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5911 if(nstr)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5912 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	5913 else
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5914 *buffer = '\0';
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5915 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5916 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	5917 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5918 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	5919 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	5920
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5921 if(index > count)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5923 *buffer = '\0';
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 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5926 {
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	5927 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	5928 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	5929
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 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	5931 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5932 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5935
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 * 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	5938 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5939 * 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	5940 * 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	5941 * 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	5942 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 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	5944 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	5945 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	5946 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	5947 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5948 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5949 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5950
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5951 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	5952 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5953 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5954
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5955 [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	5956 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5957 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	5958 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5959 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	5960 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	5961
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5962 if(index <= count)
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 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	5965 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	5966
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	5967 [[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	5968 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	5969 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5970 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5971 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5972 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5976 * 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	5977 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5978 * 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	5979 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5980 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	5981 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	5982 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	5983 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	5984 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5985 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987 int result = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5989 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	5990 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5991 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5992
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5993 result = [combo selectedIndex];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5994 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	5995 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	5996 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5997 DWContainer *cont = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5998 NSIndexPath *ip = [cont indexPathForSelectedRow];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	5999
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6000 if(ip)
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6001 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	6002 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6003 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	6004 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6007 * 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	6008 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6009 * 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	6010 * 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	6011 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012 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	6013 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	6014 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	6015 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	6016 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6017 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 int retval = -1;
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 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	6022 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6023 DWContainer *cont = handle;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	6024 NSArray *selected = [cont indexPathsForSelectedRows];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6025 NSIndexPath *ip = [selected objectAtIndex:(where == -1 ? 0 :where)];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6026
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6027 if(ip)
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6028 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	6029 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6030 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	6031 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6032
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 * 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	6035 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6036 * 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	6037 * index: Item index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 * 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	6039 */
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6040 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	6041 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	6042 DW_FUNCTION_NO_RETURN(dw_listbox_select)
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6043 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	6044 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6046 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6047
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6048 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	6049 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6050 DWContainer *cont = handle;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6051 NSIndexPath *ip = [NSIndexPath indexPathForRow:index inSection:0];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6052
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6053 [cont selectRowAtIndexPath:ip
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6054 animated:NO
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6055 scrollPosition:UITableViewScrollPositionNone];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6056 }
2804 deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6057 else if([object isMemberOfClass:[DWComboBox class]])
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6058 {
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6059 DWComboBox *combo = handle;
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6060 [combo selectIndex:index];
deefe6f5d716 iOS: Implement dw_listbox_select() for comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2794 diff changeset	6061 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6063 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6066 * 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	6067 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6068 * 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	6069 * index: Item index.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6070 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6071 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	6072 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	6073 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	6074 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	6075 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6077 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6078
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6079 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	6080 {
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6081 DWComboBox *combo = handle;
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6082
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6083 [combo deleteAtIndex:index];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6084 }
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6085 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	6086 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6087 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6088
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 [cont removeRow:index];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090 [cont reloadData];
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	6091 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6092 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6093 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6094 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6095
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6096 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6097 * 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	6098 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6099 * 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	6100 * 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	6101 */
2432 5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6102 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	6103 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	6104 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	6105 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	6106 {
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	6107 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	6108 if(text)
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6109 [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	6110 [combo setTag:cid];
5e0507e67c5d iOS: Initial implementation of DWComboBox, not fully functional yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2430 diff changeset	6111 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	6112 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6113
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6114 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6115 * 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	6116 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6117 * 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	6118 */
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	6119 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	6120 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	6121 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	6122 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	6123 {
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	6124 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	6125 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	6126 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	6127 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	6128 [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	6129 [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	6130 DWMLE *mle = [[[DWMLE alloc] initWithFrame:frame textContainer:tc] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6131 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	6132
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 size.width = size.height;
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6134 [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	6135 [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	6136 [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	6137 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	6138 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6139
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 * 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	6142 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6143 * 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	6144 * 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	6145 * 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	6146 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6147 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	6148 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	6149 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	6150 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	6151 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6152 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6153 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6154 unsigned int retval;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6155 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 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	6157 UIColor *fgcolor = [mle textColor];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6158 UIFont *font = [mle font];
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6159 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	6160 [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	6161 if(font)
ba24ddb19a43 iOS: Fix font and colors on MLE imported text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2443 diff changeset	6162 [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	6163 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	6164 NSUInteger length = [ts length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6165 if(startpoint < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6166 startpoint = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6167 if(startpoint > length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6168 startpoint = (int)length;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6169 [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	6170 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	6171 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	6172 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6173
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6174 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6175 * 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	6176 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6177 * 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	6178 * 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	6179 * 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	6180 * 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	6181 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182 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	6183 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	6184 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	6185 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	6186 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6187 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6188 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6189 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6190 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191 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	6192 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	6193 buffer[length] = '\0';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6195 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6196
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 * 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	6199 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6200 * 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	6201 * 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	6202 * 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	6203 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6204 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	6205 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	6206 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	6207 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	6208 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6209 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6210 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6211 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6212 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6213 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	6214
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215 if(bytes)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6216 *bytes = stringLength;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6217 if(lines)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6218 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6219 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	6220 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	6221
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 *lines = numberOfLines;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6223 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6224 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6225 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6226
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 * 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	6229 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6230 * 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	6231 * 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	6232 * 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	6233 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6234 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	6235 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	6236 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	6237 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	6238 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6239 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6241 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6242 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6243 NSUInteger mslength = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244 if(startpoint < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6245 startpoint = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 if(startpoint > mslength)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6247 startpoint = (int)mslength;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 if(startpoint + length > mslength)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6249 length = (int)mslength - startpoint;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6250 [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	6251 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255 * 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	6256 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6257 * 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	6258 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 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	6260 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	6261 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	6262 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	6263 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6264 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6265 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6266 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6267 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6268 NSUInteger length = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6269 [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	6270 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6274 * 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	6275 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6276 * 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	6277 * 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	6278 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6279 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	6280 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	6281 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	6282 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	6283 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6284 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6285 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6286 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6287 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6288 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	6289
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6290 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	6291 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	6292
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293 if(line == numberOfLines)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6294 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6295 [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	6296 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6297 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6298 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6301 * 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	6302 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6303 * 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	6304 * 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	6305 */
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	6306 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	6307 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	6308 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	6309 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	6310 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6311 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	6312 [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	6313 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	6314 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6315
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6317 * 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	6318 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6319 * 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	6320 * 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	6321 */
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	6322 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	6323 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	6324 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	6325 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	6326 {
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 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	6328
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	6329 [[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	6330 [[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	6331 if(!state)
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6332 [[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	6333 else
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6334 {
246f23670e3b iOS: Fix dw_mle_set_word_wrap() and dw_checkbox_get(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2699 diff changeset	6335 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	6336 [[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	6337 }
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	6338 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	6339 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6340
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6341 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6342 * 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	6343 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6344 * 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	6345 * 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	6346 */
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	6347 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	6348 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	6349 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	6350 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	6351 {
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	6352 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	6353 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	6354 [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	6355 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	6356 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6359 * 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	6360 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6361 * 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	6362 * 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	6363 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6364 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	6365 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	6366 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	6367 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	6368 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6371 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6373 NSUInteger length = [ms length];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6374 if(point < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6375 point = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6376 if(point > length)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6377 point = (int)length;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6378 [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	6379 [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	6380 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6381 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6384 * 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	6385 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6386 * 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	6387 * 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	6388 * 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	6389 * flags: Search specific flags.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6390 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6391 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	6392 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	6393 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	6394 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	6395 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6396 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6397 DWMLE *mle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6398 NSTextStorage *ts = [mle textStorage];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 NSMutableString *ms = [ts mutableString];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6400 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	6401 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	6402 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	6403 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	6404 int retval = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6405
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6406 if(ms)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6407 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	6408 if(range.location == NSNotFound)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6409 retval = (int)range.location;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6410 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	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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6414 * 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	6415 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6416 * 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	6417 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6418 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	6419 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6420 /* 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	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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 * 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	6425 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6426 * 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	6427 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6428 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	6429 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6430 /* 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	6431 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6432
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6433 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6434 * 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	6435 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6436 * 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	6437 * 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	6438 */
2540 1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6439 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	6440 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	6441 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	6442 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	6443 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6444 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	6445 [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	6446 [textfield setTag:cid];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6447 if(DWDefaultFont)
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6448 {
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6449 [textfield setFont:DWDefaultFont];
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6450 }
1c17472a175a iOS: Implement scrollbars as sliders... implement vertical with a transform. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	6451 [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	6452 [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	6453 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	6454 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6455
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6456 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6457 * 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	6458 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6459 * 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	6460 * 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	6461 */
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	6462 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	6463 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	6464 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	6465 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	6466 {
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	6467 DWText *textfield = [[[DWText alloc] init] retain];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6468 [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	6469 [textfield setTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6470 if(DWDefaultFont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6471 {
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6472 [textfield setFont:DWDefaultFont];
3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	6473 }
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	6474 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	6475 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6476
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6477 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6478 * 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	6479 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 * 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	6481 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6482 * 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	6483 */
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	6484 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	6485 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	6486 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	6487 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	6488 {
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	6489 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	6490 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	6491 [render setTag:cid];
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	6492 [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	6493 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	6494 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6495
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6496 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6497 * 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	6498 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6499 * 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	6500 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6501 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	6502 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	6503 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	6504 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	6505 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6506 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6507 DWRender render = (DWRender )handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6508
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	6509 [render setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6510 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6511 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6512
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6513 /* 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	6514 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6515 * red: red value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6516 * green: green value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6517 * blue: blue value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6518 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6519 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	6520 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521 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	6522 UIColor *newcolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6523 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6524
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6525 _dw_foreground = _dw_get_color(value);
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6526
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6527 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	6528 DW_GREEN_VALUE(_dw_foreground)/255.0 blue:
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6529 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	6530 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	6531 [oldcolor release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6532 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6533 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6534
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6535 /* 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	6536 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6537 * red: red value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6538 * green: green value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6539 * blue: blue value.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6540 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6541 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	6542 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6543 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	6544 UIColor *newcolor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6545 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6546
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6547 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	6548 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6549 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	6550 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6551 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6552 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6553 _dw_background = _dw_get_color(value);
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6554
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6555 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	6556 DW_GREEN_VALUE(_dw_background)/255.0 blue:
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	6557 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	6558 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	6559 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6560 [oldcolor release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6561 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6562 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6563
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6564 /* 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	6565 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6566 * value: current color
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6567 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6568 * 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	6569 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6570 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	6571 {
2723 27fd270cb0db iOS: Implement initial color in the color picker dialog. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2718 diff changeset	6572 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	6573 unsigned long newcolor = value;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6574
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6575 [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	6576 if([params count] > 1)
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6577 newcolor = [[params lastObject] unsignedLongValue];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6578
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	6579 return newcolor;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6580 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6581
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6582 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	6583 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6584 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	6585
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6586 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	6587 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6588 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	6589
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6590 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	6591 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6592 if(context)
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6593 CGContextSetAllowsAntialiasing(context, antialiased);
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6594 return context;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6595 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6597 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	6598 {
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6599 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	6600 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	6601 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	6602 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	6603 return nil;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6604 }
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6605
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6606 /* 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	6607 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6608 * 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	6609 * 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	6610 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6611 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6612 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6613 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	6614 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	6615 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	6616 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	6617 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6618 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	6619 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	6620 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	6621
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6622 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6623 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	6624
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6627 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	6628 [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	6629 [_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	6630
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6631 [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	6632 [aPath stroke];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6633 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6634 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6635 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6638
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6639 /* 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	6640 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 * 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	6642 * 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	6643 * x1: First X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6644 * y1: First Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6645 * x2: Second X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6646 * y2: Second Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6647 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6648 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	6649 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	6650 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	6651 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	6652 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6653 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	6654 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	6655 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	6656
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6657 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6658 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	6659
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6660 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6661 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6662 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	6663 [_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	6664
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6665 [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	6666 [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	6667 [aPath stroke];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6668 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6669 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6670 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6671 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6672 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6673
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6674 /* 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	6675 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676 * 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	6677 * 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	6678 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6679 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6680 * 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	6681 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6682 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	6683 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	6684 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	6685 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	6686 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6687 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6688 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	6689 DWImage *bi = nil;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6690 UIFont *font = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6691 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	6692 id image = handle;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6693
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6694 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6695 {
2395 2618277de356 iOS: Code error cleanup reported by LLVM. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2393 diff changeset	6696 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	6697 font = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6698 render = pixmap->handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6699 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	6700 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6701 font = [render font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6702 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6703 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6704 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	6705 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6706 render = image;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6707 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	6708 bi = [render cachedImage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6709 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6710 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6711 {
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6712 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	6713
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6714 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6715 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	6716
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6717 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	6718 if(_dw_bg_color)
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6719 [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	6720 if(font)
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6721 [dict setValue:font forKey:NSFontAttributeName];
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6722 [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	6723 [dict release];
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6724 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6725 UIGraphicsPopContext();
2372 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 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6730 /* 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	6731 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6732 * 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	6733 * 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	6734 * 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	6735 * 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	6736 * 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	6737 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6738 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	6739 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6740 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6741 NSString *nstr;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6742 UIFont *font = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6743 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6744
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6745 nstr = [NSString stringWithUTF8String:text];
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 /* 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	6748 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6749 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6750 object = pixmap->handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6751 font = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6752 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6753 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	6754 /* 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	6755 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	6756 \|\| [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	6757 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6758 font = [object font];
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 /* 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	6761 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6762 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6763 [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	6764 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6765 /* 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	6766 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	6767 [dict release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6768 /* 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	6769 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6770 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6771 *width = size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6772 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6773 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6774 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6775 *height = size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6776 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6777 DW_LOCAL_POOL_OUT;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780 /* 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	6781 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 * 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	6783 * 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	6784 * 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	6785 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6786 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6787 * width: Width of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6788 * height: Height of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6789 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6790 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	6791 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	6792 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	6793 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	6794 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6795 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	6796 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	6797 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	6798
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6799 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6800 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	6801
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6802 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6803 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6804 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	6805 int z;
404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	6806
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6807 [_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	6808
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6809 [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	6810 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	6811 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6812 [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	6813 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6814 [aPath closePath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6815 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	6816 [aPath fill];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6817 else
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6818 [aPath stroke];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6819 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6820 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6821 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6822 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6825 /* 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	6826 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6827 * 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	6828 * 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	6829 * 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	6830 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6831 * y: Y coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6832 * width: Width of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6833 * height: Height of rectangle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6834 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6835 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	6836 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	6837 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	6838 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	6839 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6840 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	6841 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	6842 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	6843
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6844 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6845 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	6846
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6847 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6848 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6849 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	6850
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6851 [_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	6852
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6853 if(flags & DW_DRAW_FILL)
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6854 [bp fill];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6855 else
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6856 [bp stroke];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6857 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6858 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6859 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6860 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6861 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6862
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6863 /* 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	6864 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6865 * 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	6866 * 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	6867 * 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	6868 * 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	6869 * 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	6870 * 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	6871 * 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	6872 * 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	6873 * 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	6874 * 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	6875 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6876 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	6877 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	6878 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	6879 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	6880 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6881 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	6882 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	6883 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	6884
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6885 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6886 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	6887
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6888 if(bi)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6889 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6890 UIBezierPath* aPath;
2729 f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6891
f9df10c66353 iOS: Pass thread specific colors through thread safety macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2726 diff changeset	6892 [_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	6893
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6894 /* 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	6895 if(flags & DW_DRAW_FULL)
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6896 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	6897 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6898 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6899 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	6900 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	6901 double dx = xorigin - x1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6902 double dy = yorigin - y1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6903 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	6904
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6905 /* Prepare to draw */
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6906 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	6907 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	6908 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6909 /* 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	6910 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	6911 [aPath fill];
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6912 else
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	6913 [aPath stroke];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6914 }
2435 7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6915 if(context)
7d6c8b7f41d9 iOS: Implement graphic context pushing and popping during draw. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2434 diff changeset	6916 UIGraphicsPopContext();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6917 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6918 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6919
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6920 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6921 * 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	6922 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6923 * 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	6924 * resource file.
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6925 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6926 * 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	6927 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6928 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	6929 DW_FUNCTION_ADD_PARAM1(cid)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6930 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	6931 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6932 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6933 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6934 DWTree *tree = [[[DWTree alloc] init] retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6935 [tree setTag:cid];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6936 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	6937 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6938
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6939 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6940 * 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	6941 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6942 * 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	6943 * 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	6944 * 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	6945 * 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	6946 * 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	6947 * 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	6948 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6949 * 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	6950 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6951 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	6952 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	6953 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	6954 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	6955 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6956 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6957 DWTree *tree = handle;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6958 DWTreeItem *treeparent = item ? item : parent;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6959 DWTreeItem *treeitem = [[[DWTreeItem alloc] initWithIcon:icon
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6960 Title:[NSString stringWithUTF8String:(title ? title : "")]
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6961 andData:itemdata] retain];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6962 if(treeparent)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6963 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6964 if(item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6965 [treeparent insertChildAfter:treeitem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6966 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6967 [treeparent appendChild:treeitem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6968 }
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6969 else
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6970 [tree insertTreeItem:treeitem];
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6971 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	6972 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6975 * 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	6976 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6977 * 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	6978 * 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	6979 * 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	6980 * 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	6981 * 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	6982 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6983 * 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	6984 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6985 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	6986 {
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6987 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	6988 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6989
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6990 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6991 * 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	6992 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6993 * 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	6994 * 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	6995 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	6996 * 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	6997 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	6998 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	6999 DW_FUNCTION_ADD_PARAM2(handle, item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7000 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	7001 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	7002 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7003 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7004 char *title = NULL;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7005 DWTreeItem *treeitem = item;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7006 if(treeitem)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7007 title = strdup([treeitem.title UTF8String]);
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7008 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	7009 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7010
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7011 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7012 * 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	7013 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7014 * 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	7015 * 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	7016 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7017 * 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	7018 */
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7019 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	7020 DW_FUNCTION_ADD_PARAM2(handle, item)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7021 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	7022 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	7023 {
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7024 DW_FUNCTION_INIT;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7025 DWTreeItem *treeparent = nil;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7026 DWTreeItem *treeitem = item;
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7027 if(treeitem)
f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7028 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	7029 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	7030 treeparent = NULL;
2765 f734185664cc iOS: Initial tree view implementation for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2764 diff changeset	7031 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	7032 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7033
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7034 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7035 * 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	7036 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7037 * 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	7038 * 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	7039 * 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	7040 * 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	7041 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7042 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	7043 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	7044 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	7045 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	7046 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7047 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	7048 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	7049 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	7050 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7051 [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	7052 [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	7053 }
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_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7055 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7056
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7057 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7058 * 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	7059 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7060 * 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	7061 * 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	7062 * 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	7063 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7064 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	7065 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	7066 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	7067 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	7068 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7069 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	7070 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	7071 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	7072 [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	7073 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	7074 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7075
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7076 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7077 * 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	7078 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7079 * 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	7080 * 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	7081 * Returns:
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	7082 * 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	7083 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7084 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	7085 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	7086 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	7087 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	7088 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7089 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	7090 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	7091 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	7092 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	7093 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	7094 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	7095 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7096
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7097 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7098 * 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	7099 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7100 * 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	7101 * 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	7102 */
2769 06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7103 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	7104 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	7105 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	7106 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	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 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	7109 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	7110 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	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 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	7113 {
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7114 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	7115 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	7116 {
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7117 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	7118
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7119 [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	7120 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	7121 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	7122 }
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7123 }
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7124 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	7125 }
06f45ee90e0f iOS: dw_tree_get_parent() should return NULL for the root node. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2767 diff changeset	7126
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7127
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7128 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7129 * 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	7130 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7131 * 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	7132 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7133 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	7134 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	7135 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	7136 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	7137 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7138 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	7139 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	7140 [tree clear];
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_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7142 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7143
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7144 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7145 * 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	7146 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7147 * 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	7148 * 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	7149 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7150 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	7151 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	7152 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	7153 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	7154 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7155 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	7156 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	7157 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	7158 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	7159 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7160 [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	7161 [tree reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7162 [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	7163 }
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_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7165 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7166
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7167 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7168 * 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	7169 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7170 * 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	7171 * 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	7172 */
2767 de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7173 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	7174 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	7175 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	7176 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	7177 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7178 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	7179 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	7180 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	7181 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	7182 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7183 [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	7184 [tree reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7185 [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	7186 }
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_RETURN_NOTHING;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7188 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7189
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7190 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7191 * 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	7192 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7193 * 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	7194 * 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	7195 */
2767 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_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	7197 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	7198 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	7199 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	7200 {
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7201 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	7202 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	7203 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	7204 [treeitem removeFromParent];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7205 [tree reloadData];
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7206 [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	7207 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	7208 }
de144e0fbdf1 iOS: Implement all the tree functions. Fix incorrect display due to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2766 diff changeset	7209
2372 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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 * 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	7213 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 * 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	7215 * resource file.
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 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	7218 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	7219 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	7220 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	7221 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7222 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7223 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	7224 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	7225 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7226
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7227 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7228 * 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	7229 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7230 * 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	7231 * 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	7232 * 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	7233 * 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	7234 * 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	7235 * (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	7236 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237 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	7238 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	7239 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	7240 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	7241 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7242 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7243 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	7244 DWContainer *cont = handle;
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 [cont setup];
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 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	7249 {
2387 deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7250 /* 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	7251 * 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	7252 */
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7253 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	7254
deb2345f4518 iOS: Implement the UITableViewDataSource protocol so DWContainer doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2385 diff changeset	7255 [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	7256 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7257 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	7258 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7259
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 * 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	7262 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7263 * 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	7264 * 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	7265 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7266 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	7267 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7268 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	7269
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 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	7271 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7273 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7274 * 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	7275 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7276 * 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	7277 * 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	7278 * 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	7279 * 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	7280 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7281 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	7282 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7283 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	7284 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	7285 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	7286 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7287
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7288 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	7289
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7290 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	7291
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7292 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	7293 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	7294
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7295 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	7296 [cont setFilesystem:YES];
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 if(coltitle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7299 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7300 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	7301 free(coltitle);
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 free(newtitles);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7304 free(newflags);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7305 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7306 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7309 * 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	7310 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311 * 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	7312 * 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	7313 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7314 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	7315 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	7316 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	7317 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	7318 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7321 [cont addRows:rowcount];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 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	7323 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7324
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7325 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7326 * 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	7327 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7328 * 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	7329 * 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	7330 * 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	7331 * 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	7332 * 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	7333 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334 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	7335 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	7336 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	7337 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	7338 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7339 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7341 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	7342 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	7343 int lastadd = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7344
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345 /* 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	7346 if(pointer)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347 lastadd = [cont lastAddPoint];
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 if(data)
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 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	7352 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353 icon = ((UIImage *)data);
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 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	7356 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357 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	7358 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	7359 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7360 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7361 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 char textbuffer[101] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7364 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	7365 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7366 ULONG tmp = ((ULONG )data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7367
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368 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	7369 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7370 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	7371 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7372 struct tm curtm;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 CDATE cdate = ((CDATE )data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7374
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7375 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	7376 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	7377 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	7378 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	7379
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7380 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	7381 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382 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	7383 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7384 struct tm curtm;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7385 CTIME ctime = ((CTIME )data);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7386
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7387 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	7388 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	7389 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	7390 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	7391
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7392 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	7393 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7394 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	7395 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	7396 }
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
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7399 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	7400 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	7401
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7402 /* 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	7403 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	7404 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7405 DWTableViewCell *cell = object;
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7406
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7407 if(column == 0)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7408 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7409 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	7410 [[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	7411 else
2830 cc9258ba53d7 iOS: Remimplement the label and image view in the custom cell. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2829 diff changeset	7412 [[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	7413 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7414 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	7415 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7416 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	7417
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7418 if(column >= capacity)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7419 capacity = column + 1;
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 if(!cd)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7422 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	7423 if(cd)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7424 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7425 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	7426 [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	7427 [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	7428 }
2827 455d539ac555 iOS: Add initial implementation of DW_CONTAINER_MODE_EXTRA. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2825 diff changeset	7429 [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	7430 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7431 }
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7432 else
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7433 {
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7434 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	7435 if(cd)
69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7436 [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	7437 /* 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	7438 [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	7439 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	7440 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7441 DW_FUNCTION_RETURN_NOTHING;
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
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 * 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	7446 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7447 * 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	7448 * 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	7449 * 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	7450 * 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	7451 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 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	7453 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 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	7455 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7456
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 * 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	7459 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460 * 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	7461 * 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	7462 * 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	7463 * 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	7464 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 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	7466 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 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	7468 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7471 * 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	7472 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7473 * 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	7474 * 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	7475 * 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	7476 * 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	7477 * 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	7478 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479 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	7480 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7481 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	7482 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7483
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7484 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7485 * 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	7486 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7487 * 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	7488 * 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	7489 * 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	7490 * 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	7491 * 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	7492 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7493 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	7494 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	7495 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	7496 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	7497 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7498 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7499 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7500 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	7501 int lastadd = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7502
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7503 /* 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	7504 if(pointer)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7505 lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7506
2825 69e144d81f19 iOS: Rewrite DWContainer to use a single DWTableViewCell per row. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2822 diff changeset	7507 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	7508
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7509 /* 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	7510 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	7511 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	7512 DWTableViewCell *cell = object;
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7513
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 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	7515 [[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	7516 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	7517 [[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	7518 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7519 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	7520 [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	7521 [cont setNeedsDisplay];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7522 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526 * 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	7527 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7528 * 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	7529 * 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	7530 * 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	7531 * 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	7532 * 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	7533 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7534 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	7535 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536 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	7537 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 * 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	7541 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7542 * 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	7543 * column: Zero based column.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7544 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7545 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	7546 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	7547 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	7548 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	7549 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7550 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7551 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7552 int rc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7553 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	7554 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	7555 rc = DW_CFA_BITMAPORICON;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556 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	7557 rc = DW_CFA_STRING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7558 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	7559 rc = DW_CFA_ULONG;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7560 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	7561 rc = DW_CFA_DATE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562 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	7563 rc = DW_CFA_TIME;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7565 rc = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 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	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 * 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	7571 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572 * 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	7573 * column: Zero based column.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7575 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	7576 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7577 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	7578 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7579
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7580 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7581 * 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	7582 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7583 * 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	7584 * 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	7585 * 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	7586 * 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	7587 * 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	7588 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7589 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	7590 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	7591 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	7592 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	7593 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7594 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7595 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7596 [cont setRowBgOdd:oddcolor
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7597 andEven:evencolor];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7598 DW_FUNCTION_RETURN_NOTHING;
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 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	7603 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7604 * 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	7605 * 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	7606 * 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	7607 */
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7608 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	7609 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7610 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7611
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 * 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	7614 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7615 * 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	7616 * 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	7617 * 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	7618 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7619 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	7620 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	7621 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	7622 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	7623 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7624 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7625 DWContainer *cont = pointer;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7626 int lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7627 [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	7628 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7629 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7630
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7631
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 * 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	7634 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7635 * 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	7636 * 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	7637 * data: Data pointer.
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 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	7640 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	7641 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	7642 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	7643 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7644 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7645 DWContainer *cont = pointer;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7646 int lastadd = [cont lastAddPoint];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7647 [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	7648 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7649 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7650
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7651
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 * 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	7654 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7655 * 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	7656 * 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	7657 * 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	7658 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7659 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	7660 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	7661 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	7662 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	7663 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7664 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7665 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7666 [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	7667 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7668 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7669
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 * 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	7672 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 * 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	7674 * 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	7675 * data: Data pointer.
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 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	7678 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	7679 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	7680 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	7681 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7682 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7683 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7684 [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	7685 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7686 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7687
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 * 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	7690 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7691 * 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	7692 * 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	7693 * 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	7694 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7695 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	7696 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	7697 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	7698 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	7699 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7700 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7701 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7702 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7703 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7707 * 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	7708 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7709 * 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	7710 * 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	7711 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712 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	7713 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	7714 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	7715 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	7716 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7717 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7718 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7719 [cont clear];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7720 if(redraw)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7721 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7723 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 * 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	7727 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7728 * 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	7729 * 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	7730 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 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	7732 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	7733 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	7734 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	7735 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7736 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7737 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7738 int x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7739
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7740 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	7741 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 [cont removeRow:0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7743 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7744 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7745 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7746 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7747
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7748 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7749 * 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	7750 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7751 * 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	7752 * 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	7753 * 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	7754 * 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	7755 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	7756 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	7757 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	7758 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	7759 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	7760 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7761 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7762 DWContainer *cont = handle;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7763 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	7764 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	7765
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 /* Safety check */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7767 if(rowcount < 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7768 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7769 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7770 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7771
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7772 switch(direction)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7773 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7774 case DW_SCROLL_TOP:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7775 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7776 offset.y = 0;
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_BOTTOM:
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 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	7782 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7783 }
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	7784 /* 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	7785 case DW_SCROLL_UP:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7786 {
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 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	7788 break;
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 case DW_SCROLL_DOWN:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7791 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	7792 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	7793 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7794 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7795 }
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7796 if(offset.y < 0)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	7797 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	7798 [cont setContentOffset:offset];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7799 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7800 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7801
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7802 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7803 * 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	7804 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805 * 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	7806 * 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	7807 * 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	7808 * 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	7809 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810 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	7811 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	7812 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	7813 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	7814 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7816 DWContainer *cont = handle;
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7817 NSArray *selected = [cont indexPathsForSelectedRows];
2381 3777ea1cccdb iOS: Continuing conversion... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2380 diff changeset	7818 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	7819 void *retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7820
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7821 if(result)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 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	7824 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	7825 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7826 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7827 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	7828 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 retval = strdup(temp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7830 }
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7831 [cont setLastQueryPoint:1];
2372 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_RETURN_THIS(retval);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7834 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7835
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7836 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7837 * 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	7838 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7839 * 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	7840 * 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	7841 * 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	7842 * 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	7843 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7844 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	7845 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	7846 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	7847 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	7848 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7849 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851 int lastQueryPoint = [cont lastQueryPoint];
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7852 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	7853 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	7854 void *retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7855
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7856 if(result)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7857 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7858 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	7859 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	7860 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861 {
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7862 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	7863 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 retval = strdup(temp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7865 }
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	7866 [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	7867 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7868 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	7869 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7872 * 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	7873 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7874 * 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	7875 * 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	7876 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7877 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	7878 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	7879 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	7880 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	7881 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7882 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7883 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7884 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7885 char *thistext;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7886 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	7887
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7888 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	7889 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7890 thistext = [cont getRowTitle:x];
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 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	7893 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7894 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	7895
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7896 [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	7897 animated:NO
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7898 scrollPosition:UITableViewScrollPositionNone];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7899 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7900 break;
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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7903 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7904 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7905 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7908 * 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	7909 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7910 * 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	7911 * 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	7912 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7913 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	7914 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	7915 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	7916 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	7917 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7918 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7919 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7920 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7921 void *thisdata;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7922 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	7923
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7924 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	7925 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7926 thisdata = [cont getRowData:x];
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 if(thisdata == data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7929 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7930 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	7931
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7932 [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	7933 animated:NO
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	7934 scrollPosition:UITableViewScrollPositionNone];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7935 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7936 break;
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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7939 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7940 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7941 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 * 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	7945 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7946 * 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	7947 * 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	7948 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 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	7950 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	7951 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	7952 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	7953 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7955 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 char *thistext;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7957 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	7958
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959 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	7960 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 thistext = [cont getRowTitle:x];
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 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	7964 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7965 [cont removeRow:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7966 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7968 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7969 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 * 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	7976 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7977 * 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	7978 * data: Data specified.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 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	7981 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	7982 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	7983 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	7984 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7987 void *thisdata;
2388 d84cd4227b21 iOS: Switch to UITableViewDataSource method numberOfRowsInSection: bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2387 diff changeset	7988 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	7989
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 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	7991 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 thisdata = [cont getRowData:x];
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 if(thisdata == data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7995 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996 [cont removeRow:x];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997 [cont reloadData];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7998 x=count;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7999 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8000 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8001 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 DW_FUNCTION_RETURN_NOTHING;
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 * 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	8007 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 * 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	8009 */
2379 e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	8010 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	8011 {
e35887009bb5 iOS: Remove tree functionality, combobox and radio button... include links bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2378 diff changeset	8012 /* 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	8013 }
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 * 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	8017 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 * 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	8019 * 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	8020 * 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	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_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	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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8028 * 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	8029 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 * 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	8031 * 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	8032 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 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	8034 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8035 /* 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	8036 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038 /* 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	8039 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	8040 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 if(image)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8042 {
2373 8d6ab1f46a29 iOS: Converting more types and classes to the iOS equivalents. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2372 diff changeset	8043 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	8044 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	8045 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8046 if(size.width > 24)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8047 size.width = 24;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8048 if(size.height > 24)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8049 size.height = 24;
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8050 // 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	8051 // 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	8052 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	8053 [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	8054 UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8055 UIGraphicsEndImageContext();
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8056 return newImage;
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8057 }
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8058 }
ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8059 return image;
2372 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 /* 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	8063 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	8064 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 NSBundle *bundle = [NSBundle mainBundle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066 NSString *respath = [bundle resourcePath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 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	8068 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	8069 return image;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8072 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 * 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	8074 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 * 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	8076 * 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	8077 * 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	8078 * to an embedded XPM.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8080 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	8081 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8082 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	8083 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	8084 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8087 * 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	8088 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8089 * 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	8090 * 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	8091 * (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	8092 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8093 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	8094 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095 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	8096
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097 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	8098 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	8099 if(!image && ext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8100 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8101 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	8102 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	8103 }
2705 ddcbed595a84 iOS: Implement HICN resizing and text/label vertical centering. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2704 diff changeset	8104 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	8105 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108 * 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	8109 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 * 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	8111 * 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	8112 * (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	8113 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 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	8115 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116 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	8117 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	8118 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	8119 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120
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 * 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	8123 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 * 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	8125 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126 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	8127 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8128 UIImage *image = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130 [image release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8132 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8133
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135 * 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	8136 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 * 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	8138 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139 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	8140 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141 /* 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	8142 * 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	8143 * 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	8144 * similar behavior.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8145 */
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	8146 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	8147 [mdi setTag:cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 return mdi;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8150
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 * 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	8153 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 * 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	8155 * 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	8156 * 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	8157 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 * 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	8159 */
2641 608598b9fed9 iOS: UISplitViewController may not be the right way to implement DWSplitBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2640 diff changeset	8160 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	8161 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	8162 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	8163 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	8164 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8166 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	8167 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	8168 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	8169 [split setTopLeft:tmpbox];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8170 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	8171 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	8172 [split setBottomRight:tmpbox];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8173 [split setPercent:50.0];
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8174 [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	8175 [split setTag:cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8176 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	8177 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180 * 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	8181 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 * 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	8183 * 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	8184 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185 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	8186 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	8187 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	8188 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	8189 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 DWSplitBar *split = handle;
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8192 [split setPercent:percent];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193 DW_FUNCTION_RETURN_NOTHING;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8194 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 * 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	8198 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199 * 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	8200 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8201 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	8202 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8203 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	8204 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	8205
2646 42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8206 if(split)
42bc7ddd6751 iOS: Reimplement DWSplitBar as a UIView subclass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2641 diff changeset	8207 retval = [split percent];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 return retval;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8209 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8210
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8211 /* 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	8212 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	8213 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214 UIFont *font = DWDefaultFont;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8215
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8216 if(fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8217 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218 char *name = strchr(fontname, '.');
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 if(name && (name++))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8222 UIFontDescriptorSymbolicTraits traits = 0;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8223 UIFontDescriptor* fd;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 int size = atoi(fontname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8225 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	8226 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	8227 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	8228 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	8229
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8230 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	8231 strncpy(newname, name, len);
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8232
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8233 if(Bold)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8234 traits \|= UIFontDescriptorTraitBold;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8235 if(Italic)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8236 traits \|= UIFontDescriptorTraitItalic;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8237
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8238 fd = [UIFontDescriptor
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8239 fontDescriptorWithFontAttributes:@{UIFontDescriptorFamilyAttribute:[NSString stringWithUTF8String:newname],
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8240 UIFontDescriptorTraitsAttribute: @{UIFontSymbolicTrait:[NSNumber numberWithInteger:traits]}}];
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8241 NSArray* matches = [fd matchingFontDescriptorsWithMandatoryKeys:
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8242 [NSSet setWithObjects:UIFontDescriptorFamilyAttribute, UIFontDescriptorTraitsAttribute, nil]];
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8243 if(matches.count != 0)
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8244 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	8245 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8247 return font;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8250 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251 * 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	8252 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 * 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	8254 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 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	8256 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	8257 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	8258 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	8259 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 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	8261 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	8262 [bitmap setTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 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	8264 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 * 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	8268 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 * 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	8270 * 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	8271 * 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	8272 * 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	8273 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8274 * 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	8275 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8276 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	8277 {
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8278 HPIXMAP pixmap = NULL;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8279
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8280 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	8281 {
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8282 pixmap->width = width;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8283 pixmap->height = height;
41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8284 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	8285 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	8286 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 return pixmap;
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
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 * 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	8292 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 * 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	8294 * 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	8295 * 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	8296 * (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	8297 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298 * 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	8299 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8300 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	8301 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8302 HPIXMAP pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8303 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	8304 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	8305
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8306 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	8307 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8308 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8311 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	8312 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	8313 if(!tmpimage && ext)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 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	8316 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	8317 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318 if(!tmpimage)
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 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8323 pixmap->width = [tmpimage size].width;
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8324 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	8325 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	8326 pixmap->handle = handle;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328 return pixmap;
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
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 * 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	8333 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 * 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	8335 * 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	8336 * (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	8337 * le: length of data
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 * 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	8340 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8341 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	8342 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8343 HPIXMAP pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 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	8347 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8348 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8349 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8351 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	8352 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	8353 if(!tmpimage)
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 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 }
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8358 pixmap->width = [tmpimage size].width;
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8359 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	8360 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	8361 pixmap->handle = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8362 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 return pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8364 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8365
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8366 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 * 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	8368 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369 * 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	8370 * dw_pixmap_new..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8371 * color: transparent color
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8372 * 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	8373 * is handled automatically
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8374 */
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8375 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	8376 {
00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	8377 /* 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	8378 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8379
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8380 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8381 * 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	8382 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383 * 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	8384 * 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	8385 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8386 * 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	8387 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8388 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	8389 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 HPIXMAP pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8391 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8393 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	8394 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8395 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8396 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8397 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8398
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8399 NSBundle *bundle = [NSBundle mainBundle];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8400 NSString *respath = [bundle resourcePath];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8401 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	8402 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	8403
2382 41a04e6b3e8e iOS: More conversion... mostly drawing related changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2381 diff changeset	8404 if(tmpimage)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 {
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8406 pixmap->width = [tmpimage size].width;
6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	8407 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	8408 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	8409 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	8410 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	8411 return pixmap;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8412 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8413 free(pixmap);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8414 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8415 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8416 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8419 * 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	8420 * 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	8421 * 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	8422 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8423 * 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	8424 * 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	8425 * 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	8426 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8427 * 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	8428 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8429 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	8430 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8431 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8432 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8433 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	8434
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8435 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438 UIFont *oldfont = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8439 [font retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8440 pixmap->font = font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 if(oldfont)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8442 [oldfont release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8445 }
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 return DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8449
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8451 * Destroys an allocated pixmap.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8452 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8453 * 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	8454 * dw_pixmap_new..
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8455 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8456 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	8457 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8458 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8459 {
2434 404d9e9f1f08 iOS: Second attempt at a DWImage class that will actually work.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2433 diff changeset	8460 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	8461 UIFont *font = pixmap->font;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 [image release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8464 [font release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8465 free(pixmap);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8467 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8468 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8469
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8470 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8471 * 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	8472 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8473 * dest: Destination window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8474 * 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	8475 * 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	8476 * 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	8477 * 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	8478 * 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	8479 * src: Source window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8480 * 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	8481 * 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	8482 * 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	8483 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 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	8485 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8486 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	8487 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8489 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 * 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	8491 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492 * dest: Destination window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8493 * 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	8494 * 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	8495 * 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	8496 * 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	8497 * 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	8498 * src: Source window handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 * 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	8500 * 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	8501 * 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	8502 * 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	8503 * 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	8504 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8505 * 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	8506 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8507 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	8508 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509 DWBitBlt *bltinfo;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 NSValue* bi;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8511 DW_LOCAL_POOL_IN;
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 /* Sanity checks */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514 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	8515 ((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	8516 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 return DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521 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	8522 bi = [NSValue valueWithPointer:bltinfo];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524 /* Fill in the information */
2436 ab36fbb50fe5 iOS: Fixes to get cachedImage functionality working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2435 diff changeset	8525 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	8526 bltinfo->src = src;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8527 bltinfo->xdest = xdest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528 bltinfo->ydest = ydest;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8529 bltinfo->width = width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8530 bltinfo->height = height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531 bltinfo->xsrc = xsrc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8532 bltinfo->ysrc = ysrc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8533 bltinfo->srcwidth = srcwidth;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8534 bltinfo->srcheight = srcheight;
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 if(srcp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8537 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8538 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	8539 [object retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8540 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8541 [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	8542 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8543 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8544 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8545
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8547 * 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	8548 * 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	8549 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8550 * 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	8551 * 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	8552 */
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	8553 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	8554 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	8555 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	8556 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	8557 {
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	8558 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	8559 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	8560 [calendar setPreferredDatePickerStyle:UIDatePickerStyleInline];
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8561 } else {
1d2f5c4eccc5 iOS: Implement keyboard handling for iOS 13.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2577 diff changeset	8562 // 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	8563 // 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	8564 }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8565 [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	8566 [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	8567 [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	8568 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	8569 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 * 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	8573 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8574 * 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	8575 * year...
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8576 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8577 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	8578 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	8579 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	8580 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	8581 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8582 DWCalendar *calendar = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 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	8584 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	8585
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 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	8587
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	8588 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	8589 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	8590
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8591 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	8592 [calendar setDate:date];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 [date release];
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8594 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	8595 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8596
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8597 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8598 * 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	8599 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600 * 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	8601 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8602 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	8603 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	8604 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	8605 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	8606 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8607 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	8608 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	8609 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	8610 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	8611 *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	8612 *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	8613 *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	8614 [mycalendar release];
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	8615 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	8616 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619 * 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	8620 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 * 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	8622 * 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	8623 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8624 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	8625 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	8626 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	8627 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	8628 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 DWWebView *html = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 switch(action)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8631 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8632 case DW_HTML_GOBACK:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8633 [html goBack];
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_GOFORWARD:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8636 [html goForward];
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_GOHOME:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8639 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	8640 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8641 case DW_HTML_SEARCH:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8642 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8643 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	8644 [html reload];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8645 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8646 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	8647 [html stopLoading];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8648 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8649 case DW_HTML_PRINT:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8650 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8651 }
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8652 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	8653 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8654
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8655 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8656 * 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	8657 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8658 * 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	8659 * 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	8660 * be rendered.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8661 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8662 * 0 on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8663 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8664 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	8665 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	8666 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	8667 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	8668 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8669 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	8670 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	8671 [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	8672 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	8673 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8674
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8675 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8676 * 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	8677 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8678 * 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	8679 * 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	8680 * 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	8681 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682 * 0 on success.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8683 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8684 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	8685 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	8686 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	8687 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	8688 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 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	8690 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	8691 [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	8692 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	8693 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8694
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8695 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8696 * 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	8697 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8698 * 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	8699 * 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	8700 * 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	8701 * 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	8702 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8703 * 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	8704 */
2404 d4a044d24529 iOS: Fix crashes with full dwtest run. More thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2402 diff changeset	8705 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	8706 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	8707 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	8708 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	8709 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8710 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	8711 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	8712 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8713
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 [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	8715 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8716 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	8717 _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	8718 }];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8719 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	8720 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	8721 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8722
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 * 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	8725 * 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	8726 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8727 * 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	8728 * 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	8729 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8730 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	8731 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	8732 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	8733 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	8734 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8735 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	8736 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	8737 web.navigationDelegate = web;
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	8738 [web setTag:cid];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8739 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	8740 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8741
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 * 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	8744 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8745 * 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	8746 * 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	8747 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8748 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	8749 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750 if(x)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8751 {
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	8752 *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	8753 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8754 if(y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8755 {
2606 6c30fcc79402 iOS: Implement context menus on DWRender widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2605 diff changeset	8756 *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	8757 }
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 * 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	8762 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8763 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8764 * y: Y coordinate.
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 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	8767 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8768 /* 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	8769 }
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 * 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	8773 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774 * 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	8775 * resource file.
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_menu_new(ULONG cid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778 {
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8779 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	8780 return menu;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8781 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8782
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 * 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	8785 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786 * 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	8787 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8788 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	8789 {
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	8790 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	8791 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	8792
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	8793 [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	8794 return menu;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8795 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8796
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8797 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8798 * 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	8799 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8800 * 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	8801 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8802 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	8803 {
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	8804 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	8805 {
ac51cbdcfbe5 dw_menu_destroy() should zero out the handle passed, GTK does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2612 diff changeset	8806 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	8807 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	8808 [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	8809 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	8810 *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	8811 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8812 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8813
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8814 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8815 * 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	8816 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8817 * 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	8818 * 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	8819 * x: X coordinate.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8820 * y: Y coordinate.
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 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	8823 {
2616 a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8824 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	8825 {
a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8826 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	8827 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	8828 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	8829 [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	8830 *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	8831 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8832 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8833
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	8834 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	8835 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8836 int z, cur=0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8837 char accel = '\0';
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 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	8840 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8841 if(src[z] != '~')
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 dest[cur] = src[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8844 cur++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8845 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8846 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8847 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8848 accel = src[z+1];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8849 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8850 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8851 dest[cur] = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8852 return accel;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8854
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 * 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	8857 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8858 * 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	8859 * 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	8860 * 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	8861 * 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	8862 * 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	8863 * 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	8864 * 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	8865 * 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	8866 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8867 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	8868 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8869 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	8870 __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	8871 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	8872 [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	8873 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8874 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8875 char accel[2];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8876 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	8877 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	8878
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	8879 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	8880 accel[1] = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8881
2463 79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8882 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	8883 free(newtitle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8884
2616 a256caa5034c iOS: Fix a context menu related crash by removing autorelease from DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2615 diff changeset	8885 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	8886 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	8887 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	8888 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8889 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	8890 [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	8891 }
2604 4671ac4ad3c6 iOS: Had to switch from UIKeyCommand to UIAction for DWMenuItem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2603 diff changeset	8892 [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	8893 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	8894 [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	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 /* 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	8897 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	8898 [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	8899 [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	8900
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8901 if(check)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8902 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8903 [item setCheck:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8904 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	8905 [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	8906 }
2602 cc5013e626f7 iOS: Code cleanup, make sure menu items are enabled on creation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2601 diff changeset	8907 [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	8908
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8909 if(submenux)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8910 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	8911 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	8912
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8913 [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	8914 [item setSubmenu:submenu];
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	8915 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8916 return item;
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 return item;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8921 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8922 * 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	8923 * 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	8924 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8925 * 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	8926 * id: Menuitem id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8927 * 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	8928 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8929 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	8930 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8931 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	8932 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	8933
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8934 if(menuitem != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8935 {
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8936 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	8937
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8938 /* 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	8939 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	8940 {
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8941 [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	8942 [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	8943 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8944 }
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8947 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8948 * 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	8949 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8950 * 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	8951 * id: Menuitem id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8952 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8953 * 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	8954 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8955 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	8956 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8957 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	8958 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	8959
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8960 if(menuitem != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8961 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8962 [menu removeItem:menuitem];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8963 return DW_ERROR_NONE;
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 return DW_ERROR_UNKNOWN;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8968 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8969 * 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	8970 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8971 * 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	8972 * id: Menuitem id.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8973 * 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	8974 * 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	8975 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8976 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	8977 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8978 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	8979 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	8980
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8981 if(menuitem != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8982 {
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 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	8984 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	8985
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8986 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	8987 [menuitem setState:UIMenuElementStateOn];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8988 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	8989 [menuitem setState:UIMenuElementStateOff];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8990 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	8991 [menuitem setEnabled:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8992 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	8993 [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	8994
975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	8995 /* 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	8996 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	8997 [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	8998 }
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 /* Gets the notebook page from associated ID */
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9002 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	9003 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9004 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	9005 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	9006 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9007 if([notepage pageid] == pageid)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9008 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9009 return notepage;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9010 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9011 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9012 return nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9013 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9014
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9015 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9016 * 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	9017 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9018 * 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	9019 * resource file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9020 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	9021 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	9022 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	9023 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	9024 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	9025 {
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	9026 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	9027 [[notebook tabs] addTarget:notebook
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9028 action:@selector(pageChanged:)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9029 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	9030 [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	9031 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	9032 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9033
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 * 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	9036 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9037 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9038 * 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	9039 * 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	9040 */
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	9041 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	9042 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	9043 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	9044 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	9045 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9046 DWNotebook *notebook = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9047 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	9048 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	9049 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	9050 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	9051
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9052 [notepage setPageid:(int)page];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9053 if(front)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9054 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9055 [[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	9056 [views addObject:notepage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9057 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9058 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9059 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9060 [[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	9061 [views addObject:notepage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9062 }
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9063 [notebook addSubview:notepage];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9064 [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	9065
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9066 if([views count] != 1)
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9067 {
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9068 /* Otherwise hide the page */
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9069 [notepage setHidden:YES];
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9070 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9071
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	9072 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	9073 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	9074 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9077 * 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	9078 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9079 * 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	9080 * 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	9081 */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9082 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	9083 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	9084 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	9085 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	9086 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9087 DWNotebook *notebook = handle;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9088 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	9089 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9090
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9091 if(notepage != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9092 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9093 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	9094 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	9095
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9096 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	9097 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9098 [[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	9099 [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	9100 [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	9101 index--;
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9102 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	9103 [[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	9104 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	9105 [[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	9106 [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	9107 [notepage release];
a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9108 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9109 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9110 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	9111 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	9112 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9113
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9114 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9115 * 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	9116 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9117 * 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	9118 */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9119 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	9120 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	9121 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	9122 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	9123 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9124 DWNotebook *notebook = handle;
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9125 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	9126 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	9127
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	9128 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	9129 {
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9130 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	9131 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	9132
8727ad1a19c3 iOS: Fix notebook relayout on rotation. Also fix autosizing of controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2412 diff changeset	9133 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	9134 }
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9135 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	9136 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9137
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9138 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9139 * 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	9140 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9141 * 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	9142 * 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	9143 */
2409 2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9144 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	9145 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	9146 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	9147 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	9148 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9149 DWNotebook *notebook = handle;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9150 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	9151
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9152 if(notepage != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9153 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9154 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	9155 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	9156
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	9157 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	9158 {
65ff339e9cd2 iOS: A number of fixes, notebook layout select first page if none selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2417 diff changeset	9159 [[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	9160 [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	9161 }
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9162 }
2ab3e88e5d68 iOS: Implement dw_notebook_page_set(). Fix statusbar offset location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2408 diff changeset	9163 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	9164 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9165
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 * 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	9168 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9169 * handle: Notebook handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9170 * 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	9171 * 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	9172 */
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	9173 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	9174 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	9175 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	9176 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	9177 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9178 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	9179 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	9180
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9181 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	9182 {
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9183 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	9184 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	9185
0dac724f890f iOS: Fixes for notebook pages. Wasn't always using the pageID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2680 diff changeset	9186 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	9187 [[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	9188 }
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	9189 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	9190 }
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 * 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	9194 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9195 * handle: Notebook handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9196 * 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	9197 * 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	9198 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9199 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	9200 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	9201 /* 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	9202 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9203
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9204 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9205 * 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	9206 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9207 * 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	9208 * 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	9209 * 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	9210 */
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9211 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	9212 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	9213 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	9214 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	9215 {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9216 DWNotebook *notebook = handle;
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	9217 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	9218
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9219 if(notepage != nil)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9220 {
2408 795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9221 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	9222 }
795056df9efd iOS: Initial functional implmentation of the notebook/tabbed control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2407 diff changeset	9223 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	9224 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9225
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 * 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	9228 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9229 * 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	9230 * title: The Window title.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9231 * 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	9232 */
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9233 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	9234 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	9235 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	9236 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	9237 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9238 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	9239 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	9240 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	9241 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	9242 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	9243
2599 32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9244 /* 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	9245 if(style != UIUserInterfaceStyleUnspecified)
32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9246 [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	9247 [window setWindowLevel:UIWindowLevelNormal];
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9248 [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	9249 [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	9250 [[[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	9251 [_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	9252
2598 4a5364fe65b7 iOS: Add some code to include DWViewController in the UIResponder chain. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2593 diff changeset	9253 /* 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	9254 * 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	9255 */
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9256 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	9257 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	9258 [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	9259 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	9260 {
2570 2c2941e01b67 iOS: Slight refactoring to handle the possibility that the status bar bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2569 diff changeset	9261 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	9262 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	9263 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	9264 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	9265
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	9266 /* 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	9267 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	9268 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	9269 {
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9270 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	9271 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	9272 }
dd0b29320a3d iOS: Use the claimed default value for the navigation bar of 44 points. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2673 diff changeset	9273
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	9274 /* 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	9275 * 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	9276 */
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	9277 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	9278 {
b7cc83cf70fa iOS: Attempt to add "Back" button to secondaries windows to allow them to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2635 diff changeset	9279 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	9280 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	9281 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	9282 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	9283
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	9284 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	9285 }
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	9286 [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	9287 [[[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	9288 }
32728f6f7ccd iOS: Add UINavigationBar and DWView to the rootViewController's view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2598 diff changeset	9289 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9290 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	9291 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9292
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9293 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9294 * 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	9295 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9296 * 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	9297 * 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	9298 * 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	9299 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9300 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	9301 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9302 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	9303 NSValue *v;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9304 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9305 v = [NSValue valueWithPointer:params];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9306 params[0] = function;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9307 params[1] = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9308 [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	9309 free(params);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9310 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9311 }
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 * 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	9316 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9317 * 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	9318 * 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	9319 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9320 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	9321 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9322 /* 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	9323 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9324
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9325 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9326 * Makes the window visible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9327 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9328 * 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	9329 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9330 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	9331 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	9332 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	9333 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	9334 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9335 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	9336 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	9337
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9338 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	9339 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9340 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	9341 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	9342
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9343 /* 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	9344 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	9345 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9346 /* Determine the contents size */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9347 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	9348 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9349 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	9350 {
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	9351 [window makeKeyAndVisible];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9352 [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	9353 }
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9354 else
a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9355 [window setHidden:NO];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9356 }
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9357 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	9358 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9359
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9360 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9361 * Makes the window invisible.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9362 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9363 * 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	9364 */
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9365 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	9366 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	9367 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	9368 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	9369 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9370 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	9371 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	9372
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9373 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	9374 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9375 UIWindow *window = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9376
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9377 [window setHidden:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9378 }
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	9379 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	9380 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9381
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 * 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	9384 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9385 * 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	9386 * 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	9387 * 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	9388 */
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	9389 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	9390 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	9391 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	9392 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	9393 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9394 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	9395 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	9396 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	9397 UIColor *fg = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9398 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	9399 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	9400
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9401 /* 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	9402 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	9403 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9404 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	9405 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9406 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	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 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	9409 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9410
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9411 /* 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	9412 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	9413 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9414 object = [object textfield];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9415 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9416 /* 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	9417 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	9418 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9419 [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	9420 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9421 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	9422 {
2385 a126b04b9996 iOS: dwcompat now builds on iOS as well... Fixes for running dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2384 diff changeset	9423 [[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	9424 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9425 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	9426 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9427 [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	9428 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9429 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	9430 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9431 DWBox *box = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9432
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9433 [box setBackgroundColor:bg];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9434 }
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9435 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	9436 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9437 DWContainer *cont = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9438
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9439 [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	9440 [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	9441 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9442 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	9443 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9444 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	9445 [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	9446 [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	9447 }
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	9448 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	9449 }
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 * 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	9453 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9454 * 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	9455 * 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	9456 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9457 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	9458 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	9459 /* 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	9460 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	9461 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9462
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9463 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9464 * 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	9465 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9466 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9467 * 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	9468 * 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	9469 */
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	9470 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	9471 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	9472 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	9473 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	9474 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9475 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	9476
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9477 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	9478 {
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	9479 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	9480
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	9481 [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	9482 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	9483 [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	9484 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	9485 {
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	9486 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	9487 [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	9488 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	9489 [label setLineBreakMode:NSLineBreakByTruncatingTail];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9490 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9491 }
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9492 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	9493 {
60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9494 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	9495 [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	9496 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9497 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	9498 {
2425 60a459df758d iOS: Account for the special area at the bottom of certain devies. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2424 diff changeset	9499 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	9500 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	9501 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	9502
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9503 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	9504 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9505 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	9506 [menuitem setState:UIMenuElementStateOn];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9507 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	9508 [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	9509 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9510 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	9511 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9512 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	9513 [menuitem setEnabled:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9514 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	9515 [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	9516 }
2807 975df4680ff7 iOS: Need to trigger window menu rebuilds if a menu item changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2804 diff changeset	9517 /* 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	9518 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	9519 [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	9520 }
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	9521 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	9522 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9523
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 * 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	9526 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9527 * 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	9528 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9529 * 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	9530 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9531 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	9532 DW_FUNCTION_ADD_PARAM1(handle)
5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9533 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	9534 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	9535 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9536 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9537
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9538 [object becomeFirstResponder];
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9539 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	9540 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9541
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9542 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9543 * 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	9544 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9545 * 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	9546 * 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	9547 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9548 * 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	9549 */
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9550 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	9551 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	9552 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	9553 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	9554 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9555 DWWindow *window = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9556 id object = defaultitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9557
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9558 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	9559 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9560 [object becomeFirstResponder];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9561 }
2400 5e454dfab0db iOS: More thread safety, remove some debug code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2399 diff changeset	9562 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	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 * 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	9567 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9568 * 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	9569 * 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	9570 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9571 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	9572 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9573 /* 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	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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9577 * 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	9578 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9579 * 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	9580 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9581 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	9582 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9583 /* 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	9584 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9585
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9586 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9587 * Releases previous mouse capture.
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_release(void)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9590 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9591 /* 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	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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595 * 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	9596 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9597 * 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	9598 * 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	9599 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9600 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	9601 {
2383 a410d42d9e36 iOS: Implement classes for encapsulating immutable UIImage and UIMenu so the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2382 diff changeset	9602 /* 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	9603 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9604
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9605 /* 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	9606 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9607 * currfont: current font
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9608 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9609 * 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	9610 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9611 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	9612 {
2414 5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9613 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	9614 char *font = NULL;
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9615
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9616 [params addPointer:(void *)currfont];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9617 [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	9618 if([params count] > 1)
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9619 font = [params pointerAtIndex:1];
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9620
5e5fab842901 iOS: Implement dw_font_choose() and dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2413 diff changeset	9621 return font;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9622 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9623
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9624 /* 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	9625 * 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	9626 */
2391 a7bfb97fd80e iOS: Switch to using UIApplicationMain() in dw_main(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2390 diff changeset	9627 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	9628 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9629 /* 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	9630 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	9631 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9632 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	9633
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9634 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	9635 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9636 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9637 Item *thisitem = thisbox->items;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9638 int z;
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 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	9641 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9642 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	9643 return &thisitem[z];
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 }
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 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9648 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9651 * 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	9652 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9653 * 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	9654 * 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	9655 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9656 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	9657 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9658 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	9659 (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	9660
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9661 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9662 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9663 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	9664 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	9665 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9666 DWMLE *mle = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9667
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9668 [mle setFont:font];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9669 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9670 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	9671 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9672 [object setFont:font];
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 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	9675 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9676 DWRender *render = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9677
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9678 [render setFont:font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9679 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9680 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9681 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9682 /* 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	9683 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	9684
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9685 /* 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	9686 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	9687 {
9be24001d288 Style update. Add DW_SIZE_AUTO (-1) for passing automatic sizing to packing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2739 diff changeset	9688 _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	9689 /* 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	9690 _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	9691 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9692 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9693 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9694 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9695 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9696
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 * 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	9699 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9700 * 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	9701 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9702 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	9703 {
2416 353581ebf4a5 iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2415 diff changeset	9704 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	9705 UIFont *font = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9706
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9707 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	9708 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9709 font = [object font];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9710 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9711 if(font)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9712 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9713 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	9714 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	9715 return strdup([output UTF8String]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9716 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9717 return NULL;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9720 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9721 * 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	9722 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9723 * 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	9724 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9725 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	9726 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	9727 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	9728 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	9729 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9730 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9731 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9732 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9733 int retval = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9734
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9735 /* 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	9736 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	9737 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9738 DWWindow *window = handle;
2640 cee87daaf150 iOS: New method of removing DWWindow from the hierarchy. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2639 diff changeset	9739 [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	9740 [_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	9741 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	9742 {
b6ae5b017b28 iOS: Fix a crash in HandyFTP, an additional check I put in for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2819 diff changeset	9743 [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	9744 [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	9745 }
2640 cee87daaf150 iOS: New method of removing DWWindow from the hierarchy. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2639 diff changeset	9746 [[[window rootViewController] view] removeFromSuperview];
cee87daaf150 iOS: New method of removing DWWindow from the hierarchy. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2639 diff changeset	9747 [window setRootViewController:nil];
2372 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 /* 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	9750 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	9751 {
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	9752 DWMenuItem *item = object;
79c7bf492bc1 iOS: Attempt to get context menus working for iOS 13+. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2459 diff changeset	9753 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	9754
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9755 [menu removeItem:object];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9756 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9757 /* 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	9758 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	9759 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9760 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	9761
2377 6393d8c10569 iOS: More progress on converting Mac to iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2373 diff changeset	9762 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	9763 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9764 id window = [object window];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9765 Box *thisbox = [parent box];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9766 int z, index = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9767 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	9768
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9769 if(!thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9770 thisbox->count = 0;
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 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	9773 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9774 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	9775 index = z;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9776 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9777
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9778 if(index != -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9779 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9780 [object removeFromSuperview];
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	9781 [object release];
2372 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 if(thisbox->count > 1)
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 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	9786
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9787 /* 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	9788 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	9789 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9790 tmpitem[z] = thisitem[z];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9791 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9792 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	9793 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9794 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	9795 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9796 }
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 thisbox->items = tmpitem;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9799 if(thisitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9800 free(thisitem);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9801 if(tmpitem)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9802 thisbox->count--;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9803 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9804 thisbox->count = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9805
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9806 /* 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	9807 _dw_redraw(window, TRUE);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9808 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9809 }
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_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9812 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	9813 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9814
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 * 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	9817 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9818 * 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	9819 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9820 * 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	9821 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9822 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	9823 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	9824 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	9825 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	9826 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9827 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	9828 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	9829 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	9830 NSString *nsstr = nil;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9831 char *retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9832
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	9833 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	9834 {
2792 9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9835 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	9836 }
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	9837 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	9838 {
2792 9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9839 nsstr = [object text];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9840 }
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9841 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	9842 {
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9843 DWWindow *window = object;
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9844 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	9845 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	9846
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9847 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	9848 {
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9849 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	9850 {
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9851 UINavigationBar *nav = obj;
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9852 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	9853
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9854 nsstr = [item title];
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9855 }
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9856 }
9c6fdafd10be iOS: Implement dw_window_get_text() on top-level windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2791 diff changeset	9857 }
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	9858 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	9859 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	9860 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	9861 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9864 * 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	9865 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9866 * 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	9867 * 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	9868 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9869 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	9870 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	9871 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	9872 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	9873 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9874 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	9875 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	9876 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	9877 Item *item = NULL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9878
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	9879 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	9880 {
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	9881 [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	9882 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	9883 }
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	9884 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	9885 {
2427 4f078d24fe83 iOS: Correct _dw_text_handle() behavior. Add UILabel/UITextView to controls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2426 diff changeset	9886 [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	9887 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	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 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	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 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	9892 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	9893 NSArray *array = [view subviews];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9894 NSString *nstr = [NSString stringWithUTF8String:text];
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9895
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9896 [window setLargeContentTitle:nstr];
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9897
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	9898 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	9899 {
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 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	9901 {
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	9902 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	9903 UINavigationItem *item = [[nav items] firstObject];
2591 f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9904
f3d423cdbc2e iOS: Collection of various fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2589 diff changeset	9905 [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	9906 }
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	9907 }
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	9908 }
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	9909 /* 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	9910 * 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	9911 */
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	9912 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	9913 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9914 int newwidth, newheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9915
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9916 _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	9917
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9918 /* 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	9919 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	9920 (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	9921 {
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	9922 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	9923 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	9924 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	9925 item->height = newheight;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9926 /* 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	9927 _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	9928 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9929 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9930 DW_FUNCTION_RETURN_NOTHING;
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 * 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	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 (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9937 * 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	9938 */
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9939 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	9940 {
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	9941 /* 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	9942 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9943
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9944 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9945 * Disables given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9946 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9947 * 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	9948 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9949 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	9950 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	9951 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	9952 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	9953 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9954 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9955 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9956
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9957 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	9958 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9959 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	9960 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	9961 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9962 }
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	9963 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	9964 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9965 [object setEnabled:NO];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9966 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9967 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	9968 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9969 UITextView *mle = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9970
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9971 [mle setEditable:NO];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9972 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9973 DW_FUNCTION_RETURN_NOTHING;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9976 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9977 * Enables given window (widget).
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9978 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9979 * 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	9980 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9981 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	9982 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	9983 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	9984 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	9985 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9986 DW_FUNCTION_INIT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9987 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9988
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9989 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	9990 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9991 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	9992 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	9993 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9994 }
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	9995 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	9996 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9997 [object setEnabled:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9998 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9999 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	10000 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10001 UITextView *mle = object;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10002
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10003 [mle setEditable:YES];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10004 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10005 DW_FUNCTION_RETURN_NOTHING;
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
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 * 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	10010 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10011 * 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	10012 * 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	10013 * (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	10014 * 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	10015 * 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	10016 * NULL if you use the id param)
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10017 * Returns:
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10018 * DW_ERROR_NONE on success.
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10019 * DW_ERROR_UNKNOWN if the parameters were invalid.
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10020 * DW_ERROR_GENERAL if the bitmap was unable to be loaded.
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10021 */
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10022 int API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, const char *data, int len)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10023 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10024 id object = handle;
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10025 int retval = DW_ERROR_UNKNOWN;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10026
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	10027 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	10028 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10029 if(data)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10030 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10031 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10032 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	10033 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	10034
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10035 if(pixmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10036 {
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	10037 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	10038 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10039 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	10040 [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	10041 }
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10042 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	10043 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10044 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	10045 [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	10046 }
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10047 /* If we changed the bitmap... */
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10048 Item *item = _dw_box_item(handle);
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10049
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10050 /* Check to see if any of the sizes need to be recalculated */
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10051 if(item && (item->origwidth == DW_SIZE_AUTO \|\| item->origheight == DW_SIZE_AUTO))
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10052 {
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10053 _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10054 /* Queue a redraw on the top-level window */
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10055 _dw_redraw([object window], TRUE);
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10056 }
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10057 retval = DW_ERROR_NONE;
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10058 }
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10059 else
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10060 retval = DW_ERROR_GENERAL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10061 DW_LOCAL_POOL_OUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10062 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10063 else
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10064 return dw_window_set_bitmap(handle, cid, NULL);
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10065 }
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10066 return retval;
2372 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
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 * 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	10071 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10072 * 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	10073 * 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	10074 * (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	10075 * 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	10076 * 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	10077 * NULL if you use the id param)
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10078 * Returns:
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10079 * DW_ERROR_NONE on success.
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10080 * DW_ERROR_UNKNOWN if the parameters were invalid.
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10081 * DW_ERROR_GENERAL if the bitmap was unable to be loaded.
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10082 */
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10083 int API dw_window_set_bitmap(HWND handle, unsigned long resid, const char *filename)
2372 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 id object = handle;
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10086 int retval = DW_ERROR_UNKNOWN;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10087 DW_LOCAL_POOL_IN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10088
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	10089 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	10090 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10091 UIImage *bitmap = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10092
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10093 if(filename)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10094 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10095 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	10096 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	10097
2819 a2fc275fa9bb iOS: Fix major memory leaks when destroying widgets and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2818 diff changeset	10098 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	10099
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10100 if(!bitmap && ext)
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 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	10103 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	10104 }
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10105 if(!bitmap)
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10106 retval = DW_ERROR_GENERAL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10107 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10108 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	10109 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10110 bitmap = _dw_icon_load(resid);
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10111 if(!bitmap)
2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10112 retval = DW_ERROR_GENERAL;
2372 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 if(bitmap)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10116 {
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	10117 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	10118 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10119 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	10120 [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	10121 }
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10122 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	10123 {
2c03987c95bd iOS: Fix dw_window_set_bitmap() on buttons... uses a different method on bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2449 diff changeset	10124 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	10125 [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	10126 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10127
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10128 /* 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	10129 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	10130
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10131 /* 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	10132 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	10133 {
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	10134 _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	10135 /* 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	10136 _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	10137 }
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10138 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	10139 }
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 DW_LOCAL_POOL_OUT;
2850 2934b2fdcd8e Mac/iOS: Add return value to dw_window_set_bitmap(_from_data) in resource bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2844 diff changeset	10142 return retval;
2372 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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10146 * 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	10147 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10148 * 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	10149 * 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	10150 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10151 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	10152 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10153 /* 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	10154 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10155
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10156 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10157 * 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	10158 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10159 * 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	10160 * 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	10161 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10162 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	10163 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10164 NSObject *object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10165 UIView *view = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10166 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	10167 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10168 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	10169 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	10170 view = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10171 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10172 return [view viewWithTag:cid];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10173 }
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 * 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	10177 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10178 * 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	10179 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10180 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	10181 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10182 /* 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	10183 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	10184 }
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 /* 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	10187 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10188 * 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	10189 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10190 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	10191 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10192 DWWindow *window = handle;
2793 24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10193 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	10194
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10195 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	10196 {
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10197 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	10198 {
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10199 DWView *view = obj;
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10200 [view showWindow];
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10201 }
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10202 }
24977a1ec6fc iOS: Rewrite dw_window_redraw() so it actually works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2792 diff changeset	10203
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10204 [window setShown:YES];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10205 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10206
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10207 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10208 * Makes the window topmost.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10209 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10210 * 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	10211 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10212 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	10213 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10214 /* 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	10215 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	10216 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10217
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 * Makes the window bottommost.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10220 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10221 * 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	10222 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10223 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	10224 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10225 /* 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	10226 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	10227 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10230 * 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	10231 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10232 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10233 * 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	10234 * 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	10235 */
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10236 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	10237 {
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10238 /* 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	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 * 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	10243 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10244 * 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	10245 * 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	10246 * 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	10247 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10248 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	10249 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10250 id object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10251
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10252 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	10253 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10254 Box *thisbox;
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 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	10257 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10258 int depth = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10259
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10260 /* 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	10261 _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	10262
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10263 /* Return what was requested */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10264 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	10265 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	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 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10269 _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	10270 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10271
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10272 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10273 * 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	10274 * 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	10275 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10276 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10277 * 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	10278 * 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	10279 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10280 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	10281 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10282 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	10283 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	10284 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10285
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10286 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10287 * 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	10288 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10289 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10290 * 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	10291 * 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	10292 */
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10293 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	10294 {
32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10295 /* 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	10296 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10297
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10298 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10299 * 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	10300 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10301 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10302 * 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	10303 * 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	10304 * 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	10305 * 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	10306 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10307 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	10308 {
2711 00e42b9c9ebc iOS: Similarly update the comments on unimplmented functions... a unofficial bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2705 diff changeset	10309 /* 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	10310 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10311
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10312 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10313 * 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	10314 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10315 * handle: Window (widget) handle.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10316 * 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	10317 * 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	10318 * 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	10319 * 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	10320 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10321 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	10322 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10323 NSObject *object = handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10324
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2541 diff changeset	10325 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	10326 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10327 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	10328 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	10329 if(x)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10330 *x = rect.origin.x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331 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	10332 *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	10333 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10334 *width = rect.size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10335 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10336 *height = rect.size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10337 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10338 }
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2541 diff changeset	10339 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	10340 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10341 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	10342 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	10343 if(x)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10344 *x = rect.origin.x;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10345 if(y)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10346 *y = rect.origin.y;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10347 if(width)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10348 *width = rect.size.width;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10349 if(height)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10350 *height = rect.size.height;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10351 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10352 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10353 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10354
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10355 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10356 * 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	10357 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10358 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	10359 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10360 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	10361 return screenRect.size.width;
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
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 * 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	10366 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367 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	10368 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10369 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	10370 return screenRect.size.height;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10373 /* 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	10374 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	10375 {
2384 32ebd33be56b iOS: First building version. Yay! Still lots to do but progress. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2383 diff changeset	10376 /* 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	10377 return 32;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10378 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10381 * 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	10382 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10383 * 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	10384 * 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	10385 * 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	10386 * 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	10387 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10388 * 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	10389 * 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	10390 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10391 * 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	10392 * 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	10393 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10394 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	10395 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10396 char outbuf[1025] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10397 HWND retval = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10398
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399 if(description)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10400 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10401 va_list args;
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 va_start(args, description);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10404 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	10405 va_end(args);
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 /* 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	10409 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	10410 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10411 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	10412 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10413 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	10414
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 if(notification)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10416 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 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	10418 if(description)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10419 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	10420 if(imagepath)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10421 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10422 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	10423 NSError *error;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10424 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	10425 URL:url
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10426 options:nil
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10427 error:&error];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10428 if(attachment)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10429 notification.attachments = @[attachment];
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 retval = notification;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10432 }
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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10435 return retval;
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 * 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	10440 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10441 * 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	10442 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10443 * 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	10444 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10445 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	10446 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10447 if(notification)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10448 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10449 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	10450
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10451 /* Schedule the notification. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10452 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	10453 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10454 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	10455 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10456 UNMutableNotificationContent* content = (UNMutableNotificationContent *)notification;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10457 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	10458
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10459 UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10460 [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	10461 }
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 return DW_ERROR_NONE;
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 return DW_ERROR_UNKNOWN;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10466 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10467
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10468
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 * 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	10471 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10472 * 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	10473 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10474 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	10475 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10476 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	10477 strcpy(env->osName, "iOS");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10478
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10479 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	10480 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	10481 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	10482 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	10483 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	10484 #ifdef VER_REV
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10485 env->DWSubVersion = VER_REV;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10486 #else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10487 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	10488 #endif
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 env->MajorVersion = DWOSMajor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10491 env->MinorVersion = DWOSMinor;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10492 env->MajorBuild = DWOSBuild;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10495 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10496 * Emits a beep.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10497 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10498 * freq: Frequency.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10499 * dur: Duration.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10500 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10501 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	10502 {
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10503 AudioServicesPlayAlertSound((SystemSoundID)1104);
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10506 /* 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	10507 * 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	10508 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10509 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	10510 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10511 /* 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	10512 [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	10513 }
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 /* 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	10516 * 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	10517 * dw_window_get_data().
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10518 */
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10519 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	10520 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10521 UserData tmp = root;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10522
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10523 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10524 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10525 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	10526 return tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10527 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10528 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10529 return NULL;
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
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10532 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	10533 {
6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10534 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	10535
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10536 if(new)
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 new->data = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10539 return TRUE;
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 else
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 new = malloc(sizeof(UserData));
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10544 if(new)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10545 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10546 new->varname = strdup(varname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10547 new->data = data;
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 new->next = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10550
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10551 if (!*root)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10552 *root = new;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10553 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10554 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10555 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	10556
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10557 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10558 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10559 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10560 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10561 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10562 prev->next = new;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10563 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10564 return TRUE;
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 return FALSE;
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
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10570 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	10571 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10572 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	10573
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10574 while(tmp)
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 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	10577 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10578 if(!prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10579 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10580 *root = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10581 free(tmp->varname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10582 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10583 if(!all)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10584 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10585 tmp = *root;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10586 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10587 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10588 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10589 /* 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	10590 * never get here.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10591 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10592 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10593 free(tmp->varname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10594 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10595 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10596 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10597 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10598 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10599 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10600 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10601 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10602 }
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 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10605 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10606
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 * 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	10609 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 * 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	10611 * 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	10612 * 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	10613 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10614 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	10615 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	10616 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	10617 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	10618 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10619 id object = window;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10620 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	10621 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10622 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	10623 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	10624 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	10625 {
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	10626 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	10627 {
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	10628 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	10629 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	10630 }
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	10631 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10632 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10633 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	10634 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10635 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	10636 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	10637 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10638 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10639 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	10640
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10641 if(!blah)
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 if(!dataname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10644 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10645
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10646 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	10647 [object setUserdata:blah];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10648 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10649
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10650 if(data)
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10651 _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	10652 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10653 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10654 if(dataname)
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10655 _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	10656 else
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10657 _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	10658 }
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10659 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	10660 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10661
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10662 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10663 * 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	10664 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10665 * 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	10666 * 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	10667 * 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	10668 */
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10669 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	10670 DW_FUNCTION_ADD_PARAM2(window, dataname)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10671 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	10672 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	10673 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10674 id object = window;
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10675 void *retval = NULL;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10676
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10677 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	10678 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10679 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	10680 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	10681 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	10682 {
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	10683 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	10684 {
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	10685 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	10686 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	10687 }
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	10688 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10689 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10690 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	10691 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10692 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	10693 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	10694 object = [subviews firstObject];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10695 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10696 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	10697
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 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	10699 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10700 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	10701 if(ud)
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10702 retval = ud->data;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10703 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10704 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	10705 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10706
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	10707 /*
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	10708 * 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	10709 * 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	10710 * 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	10711 * 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	10712 * 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	10713 * 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	10714 */
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	10715 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	10716 {
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	10717 /* 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	10718 * 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	10719 */
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	10720 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	10721 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	10722 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	10723 }
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	10724
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10725 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10726 * 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	10727 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10728 * 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	10729 * 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	10730 * 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	10731 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10732 * 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	10733 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10734 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	10735 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	10736 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	10737 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	10738 {
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10739 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	10740
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10741 if(sigfunc)
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10743 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	10744
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10745 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	10746 _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	10747 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10748 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	10749 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10750
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10751 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10752 * Removes timer callback.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10753 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10754 * 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	10755 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10756 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	10757 DW_FUNCTION_ADD_PARAM1(timerid)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10758 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	10759 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	10760 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10761 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	10762
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10763 /* 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	10764 if(timerid)
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10765 {
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10766 NSTimer *thistimer = timerid;
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10767
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10768 [thistimer invalidate];
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10769
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10770 while(tmp)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10771 {
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2583 diff changeset	10772 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	10773 {
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10774 if(prev)
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10775 {
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10776 prev->next = tmp->next;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10777 free(tmp);
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10778 tmp = prev->next;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10779 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10780 else
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10781 {
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10782 DWRoot = tmp->next;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10783 free(tmp);
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10784 tmp = DWRoot;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10785 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10786 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10787 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10788 {
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10789 prev = tmp;
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10790 tmp = tmp->next;
2372 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 }
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10793 }
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	10794 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	10795 }
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 * 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	10799 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10800 * 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	10801 * 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	10802 * 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	10803 * 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	10804 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10805 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	10806 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10807 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	10808 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10809
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10810 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10811 * 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	10812 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10813 * 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	10814 * 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	10815 * 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	10816 * 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	10817 * 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	10818 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10819 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	10820 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10821 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	10822
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10823 /* 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	10824 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	10825 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10826 window = DWApp;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10829 if(window && signame && sigfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10830 {
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10831 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	10832 {
2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10833 _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	10834 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10835 }
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10838 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10839 * 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	10840 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10841 * 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	10842 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10843 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	10844 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10845 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	10846 ULONG message;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10847
2390 2613d1533f1a iOS: Fix initial window display and handle resize/rotation events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2389 diff changeset	10848 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	10849 return;
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 while(tmp)
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 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	10854 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10855 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	10856
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10857 if(discfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10858 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10859 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	10860 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10861
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10862 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10863 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10864 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10865 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10866 tmp = prev->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10867 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10868 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10869 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10870 DWRoot = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10871 free(tmp);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10872 tmp = DWRoot;
2372 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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10875 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10876 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10877 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10878 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10879 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10880 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10881 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10882
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 * 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	10885 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10886 * 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	10887 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10888 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	10889 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10890 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	10891
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10892 while(tmp)
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 if(tmp->window == window)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10895 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10896 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	10897
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10898 if(discfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10899 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10900 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	10901 }
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 if(prev)
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 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10906 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10907 tmp = prev->next;
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 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10910 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10911 DWRoot = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10912 free(tmp);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10913 tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10914 }
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 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10917 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10918 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10919 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10920 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10921 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10922 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10923
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10924 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10925 * 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	10926 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10927 * 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	10928 * 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	10929 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10930 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	10931 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2622 diff changeset	10932 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	10933
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10934 while(tmp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10935 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10936 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	10937 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10938 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	10939
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10940 if(discfunc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10941 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10942 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	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 if(prev)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10946 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10947 prev->next = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10948 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10949 tmp = prev->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10950 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10951 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10952 {
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10953 DWRoot = tmp->next;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10954 free(tmp);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10955 tmp = DWRoot;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10956 }
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 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10959 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10960 prev = tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10961 tmp = tmp->next;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10962 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10963 }
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
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	10966 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	10967 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10968 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	10969
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10970 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	10971 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10972 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	10973 buf[z] -= 'A' - 'a';
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10974 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10975 }
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 /* 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	10978 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10979 * 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	10980 * 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	10981 * 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	10982 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10983 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	10984 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10985 int len;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10986 char *newname;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10987 char errorbuf[1025];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10988
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10989
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10990 if(!handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10991 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10992
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10993 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	10994 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10995
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10996 /* Lenth + "lib" + ".dylib" + NULL */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10997 newname = malloc(len + 10);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10998
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10999 if(!newname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11000 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11001
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11002 sprintf(newname, "lib%s.dylib", name);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11003 _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	11004
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11005 *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	11006 if(*handle == NULL)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11007 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11008 strncpy(errorbuf, dlerror(), 1024);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11009 printf("%s\n", errorbuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11010 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	11011 *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	11012 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11013
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11014 free(newname);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11015
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11016 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	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 /* 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	11020 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11021 * 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	11022 * 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	11023 * 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	11024 * the address.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11025 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11026 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	11027 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11028 if(!func \|\| !name)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11029 return -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11030
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11031 if(strlen(name) == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11032 return -1;
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 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	11035 return (NULL == *func);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11036 }
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 /* 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	11039 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11040 * 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	11041 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11042 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	11043 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11044 if(handle)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11045 return dlclose(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11046 return 0;
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
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 * 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	11051 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11052 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	11053 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11054 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	11055
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11056 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	11057 return mutex;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11060 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11061 * 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	11062 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11063 * 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	11064 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11065 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	11066 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11067 if(mutex)
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 pthread_mutex_destroy(mutex);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11070 free(mutex);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11071 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11072 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11073
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11074 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11075 * 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	11076 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11077 * 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	11078 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11079 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	11080 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11081 /* 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	11082 * 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	11083 * 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	11084 * 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	11085 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11086 if(DWThread == pthread_self())
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 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	11089 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11090 /* 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	11091 _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	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 else
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 pthread_mutex_lock(mutex);
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 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11101 * 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	11102 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11103 * 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	11104 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11105 * 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	11106 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11107 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	11108 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11109 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	11110 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11111 return DW_ERROR_TIMEOUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11112 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11113
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 * 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	11116 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11117 * 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	11118 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11119 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	11120 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11121 pthread_mutex_unlock(mutex);
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
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 * 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	11126 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11127 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	11128 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11129 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	11130
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11131 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11132 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11133
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11134 /* 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	11135 * 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	11136 * 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	11137 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11138 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	11139 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	11140 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	11141
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11142 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	11143 eve->alive = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11144 eve->posted = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11145
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11146 return eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11147 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11148
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11149 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11150 * 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	11151 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11152 * 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	11153 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11154 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	11155 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11156 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11157 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	11158
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11159 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	11160 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	11161 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	11162 eve->posted = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11163 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	11164 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11165 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11168 * 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	11169 * 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	11170 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11171 * 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	11172 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11173 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	11174 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11175 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11176 return FALSE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11178 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	11179 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	11180 eve->posted = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11181 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	11182 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11183 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11186 * 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	11187 * 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	11188 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11189 * 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	11190 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11191 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	11192 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11193 int rc;
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 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196 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	11197
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11198 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	11199
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11200 if(eve->posted)
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 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	11203 return DW_ERROR_NONE;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11206 if(timeout != -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11207 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11208 struct timeval now;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11209 struct timespec timeo;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11210
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11211 gettimeofday(&now, 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11212 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	11213 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	11214 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	11215 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11217 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	11218 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	11219 if(!rc)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221 if(rc == ETIMEDOUT)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 return DW_ERROR_TIMEOUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11223 return DW_ERROR_GENERAL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11224 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11225
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11226 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11227 * 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	11228 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11229 * 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	11230 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11231 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	11232 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11233 if(!eve \|\| !(*eve))
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11234 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	11235
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11236 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	11237 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	11238 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	11239 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	11240 free(*eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11241 *eve = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11242
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11243 return DW_ERROR_NONE;
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
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11246 struct _dw_seminfo {
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11247 int fd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11248 int waiting;
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
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11251 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	11252 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11253 fd_set rd;
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11254 struct _dw_seminfo array = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11255 int listenfd = tmpsock[0];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 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	11257 char command;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11258 sigset_t mask;
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 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	11261 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	11262
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11263 /* problems */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11264 if(tmpsock[1] == -1)
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 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11267 return;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11270 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	11271 array[0].waiting = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11272
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11273 /* 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	11274 free(tmpsock);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11275
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11276 while(1)
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 FD_ZERO(&rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11279 FD_SET(listenfd, &rd);
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 maxfd = listenfd;
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 /* 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	11284 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	11285 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11286 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	11287 maxfd = array[z].fd;
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 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	11290 }
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(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	11293 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11294 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 return;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11296 }
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 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	11299 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11300 struct _dw_seminfo *newarray;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11301 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	11302
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11303 if(newfd > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11304 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11305 /* Add new connections to the set */
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11306 newarray = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo)(connectcount+1));
86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11307 memcpy(newarray, array, sizeof(struct _dw_seminfo)*(connectcount));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11308
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11309 newarray[connectcount].fd = newfd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11310 newarray[connectcount].waiting = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11311
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11312 connectcount++;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11313
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11314 /* 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	11315 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11316 array = newarray;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11317 }
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 /* 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	11321 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	11322 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11323 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	11324 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11325 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	11326 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11327 struct _dw_seminfo *newarray = NULL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11328
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11329 /* 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	11330 if(connectcount > 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11332 newarray = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo)(connectcount-1));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11333 if(!z)
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11334 memcpy(newarray, &array[1], sizeof(struct _dw_seminfo)*(connectcount-1));
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11337 memcpy(newarray, array, sizeof(struct _dw_seminfo)*z);
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 if(z!=(connectcount-1))
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2850 diff changeset	11339 memcpy(&newarray[z], &array[z+1], sizeof(struct _dw_seminfo)*(connectcount-(z+1)));
2372 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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11342 connectcount--;
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 /* 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	11345 free(array);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11346 array = newarray;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11347 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11348 else if(bytesread == 1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11349 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11350 switch(command)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11351 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11352 case 0:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11353 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11354 /* Reset */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11355 posted = 0;
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 1:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11359 /* Post */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11360 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11361 int s;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11362 char tmp = (char)0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11363
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11364 posted = 1;
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 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	11367 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11368 /* 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	11369 * 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	11370 * continue.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11371 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11372 if(array[s].waiting)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11373 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	11374 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11375 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11376 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11377 case 2:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11378 /* Wait */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11379 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11380 char tmp = (char)0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11381
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11382 array[z].waiting = 1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11383
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11384 /* 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	11385 if(posted)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11386 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	11387 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11388 break;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11389 case 3:
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 /* Done Waiting */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11392 array[z].waiting = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11393 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11394 break;
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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11398 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11399 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11400 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11401
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11402 /* 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	11403 /* 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	11404 * opened from other processes.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11405 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11406 * 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	11407 * 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	11408 * by other processes.
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 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	11411 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11412 struct sockaddr_un un;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11413 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	11414 HEV eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11415 DWTID dwthread;
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)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11418 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11419
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11420 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	11421
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11422 if(!eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11423 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11424 free(tmpsock);
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 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	11429 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	11430 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	11431 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	11432 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	11433 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	11434 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	11435
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11436 /* 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	11437 * to support multiple instances.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11438 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11439 remove(un.sun_path);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11440
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11441 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	11442 listen(tmpsock[0], 0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11443 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	11444 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	11445
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11446 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	11447 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11448 if(tmpsock[0] > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11449 close(tmpsock[0]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11450 if(tmpsock[1] > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11451 close(tmpsock[1]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11452 if(ev > -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11453 close(ev);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11454 free(tmpsock);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11455 free(eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11456 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11457 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11458
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11459 /* Create a thread to handle this event semaphore */
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11460 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	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 /* 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	11466 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11467 * 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	11468 * 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	11469 * by other processes.
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 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	11472 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11473 struct sockaddr_un un;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11474 HEV eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11475 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	11476 if(ev < 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11477 return NULL;
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 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	11480
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11481 if(!eve)
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 close(ev);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11484 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11485 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11486
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11487 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	11488 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	11489 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	11490 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	11491 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	11492 eve->alive = ev;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11493 return eve;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11494 }
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 /* 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	11497 * 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	11498 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11499 * 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	11500 * 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	11501 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11502 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	11503 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11504 /* signal reset */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11505 char tmp = (char)0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11506
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11507 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	11508 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11509
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11510 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	11511 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11512 return 1;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11515 /* 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	11516 * 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	11517 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11518 * 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	11519 * 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	11520 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11521 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	11522 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11523
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11524 /* signal post */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11525 char tmp = (char)1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11526
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11527 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	11528 return 0;
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 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	11531 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11532 return 1;
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
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11535 /* 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	11536 * 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	11537 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11538 * 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	11539 * 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	11540 * 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	11541 * or -1 if indefinite.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11542 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11543 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	11544 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11545 fd_set rd;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11546 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	11547 int retval = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11548 char tmp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11549
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11550 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	11551 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	11552
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11553 /* 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	11554 if(timeout != -1)
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 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	11557 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	11558
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11559 useme = &tv;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11560 }
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 FD_ZERO(&rd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11563 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	11564
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11565 /* Signal wait */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11566 tmp = (char)2;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11567 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	11568
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11569 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	11570
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11571 /* Signal done waiting. */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11572 tmp = (char)3;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11573 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	11574
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11575 if(retval == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11576 return DW_ERROR_TIMEOUT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11577 else if(retval == -1)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11578 return DW_ERROR_INTERRUPT;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11579
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11580 /* 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	11581 * 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	11582 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11583 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	11584 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11585 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11586
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11587 /* 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	11588 * 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	11589 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11590 * 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	11591 * 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	11592 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11593 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	11594 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11595 /* Finally close the domain socket,
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11596 * 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	11597 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11598 if(eve)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11599 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11600 close(eve->alive);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11601 free(eve);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11602 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11603 return 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11604 }
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 /* 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	11607 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	11608 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11609 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	11610 [pool drain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11611 pool = [[NSAutoreleasePool alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11612 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	11613 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11614
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 * 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	11617 * 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	11618 * 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	11619 * 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	11620 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11621 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	11622 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11623 /* 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	11624 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	11625 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	11626 _dw_init_colors();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11627 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11630 * 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	11631 * 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	11632 * 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	11633 * 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	11634 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11635 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	11636 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11637 UIColor *color;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11638
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11639 /* 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	11640 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	11641 [color release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11642 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	11643 [color release];
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11644 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	11645 [pool drain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11646 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11649 * Setup thread independent pools.
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 void _dwthreadstart(void *data)
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 void (threadfunc)(void ) = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11654 void tmp = (void )data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11655
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11656 _dw_init_thread();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11657
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11658 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	11659
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11660 /* Start our thread function */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11661 threadfunc(tmp[1]);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11662
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11663 free(tmp);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11664
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11665 _dw_deinit_thread();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11666 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11667
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11668 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11669 * 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	11670 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11671 * 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	11672 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11673 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	11674 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11675 UIFont *oldfont = DWDefaultFont;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11676 DWDefaultFont = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11677 if(fontname)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11678 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11679 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	11680 [DWDefaultFont retain];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11681 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11682 [oldfont release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11683 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11684
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11685 /* 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	11686 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	11687 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11688 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	11689 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	11690 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	11691
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11692 _dwmain(argc, argv);
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11693 free(data);
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
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11696 /* 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	11697 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	11698 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11699 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	11700 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	11701 /* 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	11702 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	11703 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	11704 DWObj = [[DWObject alloc] init];
2407 6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	11705 /* Create object for handling timers */
6336244aa895 iOS: Fix timers and implement dw_beep(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2405 diff changeset	11706 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	11707 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	11708 /* 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	11709 DWThread = (DWTID)-1;
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11710 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11711
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11712 /* 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	11713 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	11714 {
2396 5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11715 /* 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	11716 * 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	11717 * 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	11718 * 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	11719 */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11720 while(!DWApp)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11721 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11722 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	11723
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11724 if(DWMainEvent && !posted)
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11725 {
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11726 /* 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	11727 * 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	11728 * the UIApplication sharedApplication.
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11729 */
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11730 posted = TRUE;
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11731 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	11732 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11733 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	11734 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	11735 }
5bb3491ceba2 iOS: Get iOS basic funcionality working by creating dwmain() macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2395 diff changeset	11736 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	11737 [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	11738 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11741 * 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	11742 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11743 * 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	11744 * 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	11745 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11746 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	11747 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11748 char *lang = getenv("LANG");
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11749
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11750 /* 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	11751 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	11752 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11753 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	11754 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	11755 char *binname = strrchr(pathcopy, '/');
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11756
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11757 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	11758 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11759 /* 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	11760 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	11761 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11762 if(app)
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 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	11765 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	11766
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11767 if(len > 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11768 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11769 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	11770 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11771 *app = 0;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11772
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11773 getcwd(pathbuf, PATH_MAX);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11774
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11775 /* 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	11776 if(strcmp(pathbuf, "/") == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11777 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11778 char *pos = strrchr(pathcopy, '/');
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11779
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11780 if(pos)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11781 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11782 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	11783 chdir(pathbuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11784 }
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 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11787 if(pathcopy)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11788 free(pathcopy);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11789 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11790
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11791 /* 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	11792 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	11793 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	11794
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11795 /* 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	11796 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	11797 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	11798 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	11799 /* 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	11800 * 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	11801 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11802 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	11803 /* Create the application object */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11804 _dw_app_init();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11805 pthread_key_create(&_dw_pool_key, NULL);
2393 6669e152e30b iOS: More namespace cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2391 diff changeset	11806 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	11807 _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	11808 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	11809 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	11810 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	11811 _dw_init_colors();
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11812 DWDefaultFont = nil;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11813 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	11814 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11815 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	11816 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11817 UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11818 if(center)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11819 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11820 [center requestAuthorizationWithOptions:UNAuthorizationOptionAlert\|UNAuthorizationOptionSound
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11821 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	11822 if (granted)
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 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	11825 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11826 else
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11827 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11828 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	11829 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11830 }];
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 }
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 _DWDirtyDrawables = [[NSMutableArray alloc] init];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11835 /* 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	11836 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	11837 [thread start];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11838 [thread release];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11839 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	11840 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11841 /* 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	11842 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	11843 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11844 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11845 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11846
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11847 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11848 * 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	11849 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11850 * 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	11851 * 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	11852 * 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	11853 * 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	11854 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11855 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	11856 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11857 char namebuf[1025] = {0};
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11858 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	11859
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11860 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	11861 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	11862
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11863 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	11864 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11865 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11866 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11867 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11868
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11869 ftruncate(handle->fd, size);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11870
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11871 /* 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	11872 *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	11873
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11874 if(*dest == MAP_FAILED)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11875 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11876 close(handle->fd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11877 *dest = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11878 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11879 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11880 }
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 handle->size = size;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11883 handle->sid = getsid(0);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11884 handle->path = strdup(namebuf);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11885
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11886 return handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11887 }
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 * 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	11891 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11892 * 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	11893 * 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	11894 * 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	11895 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11896 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	11897 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11898 char namebuf[1025];
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11899 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	11900
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11901 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	11902 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	11903
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11904 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	11905 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11906 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11907 return NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11908 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11909
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11910 /* 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	11911 *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	11912
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11913 if(*dest == MAP_FAILED)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11914 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11915 close(handle->fd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11916 *dest = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11917 free(handle);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11918 return NULL;
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 handle->size = size;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11922 handle->sid = -1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11923 handle->path = NULL;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11924
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11925 return handle;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11926 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11929 * 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	11930 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11931 * 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	11932 * 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	11933 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11934 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	11935 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11936 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	11937 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	11938
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11939 close(h->fd);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11940 if(h->path)
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 /* 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	11943 * creator of the file.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11944 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11945 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	11946 remove(h->path);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11947 free(h->path);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11948 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11949 return rc;
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11953 * 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	11954 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11955 * 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	11956 * 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	11957 * 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	11958 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11959 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	11960 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11961 DWTID thread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11962 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	11963 int rc;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11964
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11965 tmp[0] = func;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11966 tmp[1] = data;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11967
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11968 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	11969 if(rc == 0)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11970 return thread;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11971 return (DWTID)-1;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11972 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11973
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11974 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11975 * 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	11976 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11977 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	11978 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11979 pthread_exit(NULL);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11980 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11981
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11982 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11983 * 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	11984 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11985 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	11986 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11987 return (DWTID)pthread_self();
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11988 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11989
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 * 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	11992 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11993 * 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	11994 * 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	11995 * 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	11996 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11997 * 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	11998 */
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	11999 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	12000 {
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	12001 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	12002 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	12003
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	12004 /* 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	12005 * 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	12006 */
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	12007 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	12008 {
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	12009 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	12010 retval = pid;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12011 else
2698 5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	12012 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	12013 }
5c43d1ee9736 iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2693 diff changeset	12014 return retval;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12015 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12016
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12017 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12018 * 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	12019 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12020 * url: Uniform resource locator.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12021 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12022 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	12023 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12024 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	12025 [DWApp openURL:myurl options:@{}
93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	12026 completionHandler:^(BOOL success) {}];
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12027 return DW_ERROR_NONE;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12028 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12029
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12030 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12031 * 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	12032 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12033 * 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	12034 * 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	12035 * 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	12036 * 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	12037 * 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	12038 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12039 * 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	12040 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12041 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	12042 {
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12043 if(drawfunc)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12044 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12045 UIPrintInfo *pi = [UIPrintInfo alloc];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12046 DWPrintPageRenderer *renderer = [DWPrintPageRenderer new];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12047 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	12048
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12049 if(!jobname)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12050 jobname = "Dynamic Windows Print Job";
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12051
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12052 [pi setOutputType:UIPrintInfoOutputGeneral];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12053 [pi setJobName:[NSString stringWithUTF8String:jobname]];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12054 [pi setOrientation:UIPrintInfoOrientationPortrait];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12055 [renderer setDrawFunc:drawfunc];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12056 [renderer setDrawData:drawdata];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12057 [renderer setPages:pages];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12058 [renderer setFlags:flags];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12059 [renderer setPrint:pa];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12060 return pa;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12061 }
2380 93424ad710de iOS: Remove printing and file browsing... more conversion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2379 diff changeset	12062 return NULL;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12063 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12064
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12065 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12066 * 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	12067 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12068 * 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	12069 * 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	12070 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12071 * 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	12072 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12073 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	12074 {
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12075 int retval = DW_ERROR_UNKNOWN;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12076
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12077 if(print)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12078 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12079 NSMutableArray *pa = print;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12080
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12081 [pa addObject:[NSNumber numberWithUnsignedLong:flags]];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12082 [DWObj safeCall:@selector(printDialog:) withObject:pa];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12083 retval = (int)[[pa lastObject] integerValue];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12084 [pa release];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12085 }
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12086 return retval;
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12087 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12088
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12089 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12090 * 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	12091 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12092 * 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	12093 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12094 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	12095 {
2726 7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12096 if(print)
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12097 {
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12098 NSMutableArray *pa = print;
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12099 UIPrintInteractionController *pc = [UIPrintInteractionController sharedPrintController];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12100
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12101 [pc dismissAnimated:YES];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12102 [pa release];
7a15401e73f4 iOS: Initial print support for iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2725 diff changeset	12103 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12104 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12105
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12106 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12107 * 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	12108 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12109 * 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	12110 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12111 * 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	12112 * or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12113 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12114 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	12115 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12116 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	12117 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	12118 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12119 mbstowcs(temp, utf8string, buflen);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12120 return temp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12121 }
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 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12124 * 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	12125 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12126 * wstring: Wide source string.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12127 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12128 * 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	12129 * or NULL on failure.
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12130 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12131 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	12132 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12133 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	12134 char *temp = malloc(bufflen);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12135 if(temp)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12136 wcstombs(temp, wstring, bufflen);
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12137 return temp;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12138 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12139
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12140 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12141 * 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	12142 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12143 * 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	12144 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12145 * 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	12146 * 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	12147 * 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	12148 * 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	12149 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12150 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	12151 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12152 switch(feature)
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 case DW_FEATURE_NOTIFICATION:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12155 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	12156 case DW_FEATURE_HTML:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12157 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	12158 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	12159 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	12160 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	12161 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	12162 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	12163 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	12164 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	12165 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	12166 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12167 if(DWObj)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12168 {
2458 689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12169 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	12170 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	12171 NSNumber *number;
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12172
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12173 [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	12174 number = [array lastObject];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12175 if(number)
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12176 retval = [number intValue];
689261c29745 iOS: DWContainer should generate selection event on deselect too. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2457 diff changeset	12177 return retval;
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12178 }
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12179 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	12180 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12181 default:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12182 return DW_FEATURE_UNSUPPORTED;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12183 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12184 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12185
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12186 /*
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12187 * 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	12188 * Parameters:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12189 * 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	12190 * 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	12191 * Returns:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12192 * 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	12193 * 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	12194 * 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	12195 * Remarks:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12196 * 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	12197 * 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	12198 */
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12199 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	12200 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12201 switch(feature)
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12202 {
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12203 /* 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	12204 case DW_FEATURE_NOTIFICATION:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12205 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	12206 case DW_FEATURE_HTML:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12207 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	12208 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	12209 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	12210 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	12211 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	12212 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	12213 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	12214 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12215 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	12216 {
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12217 _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	12218 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	12219 }
0adf73d5d8c2 iOS: First steps for implmenting container modes on iOS and eventually bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2820 diff changeset	12220 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	12221 }
2456 54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12222 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	12223 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12224 /* 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	12225 if(DWObj)
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12226 {
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12227 /* 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	12228 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	12229 [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	12230 /* 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	12231 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	12232 [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	12233 /* 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	12234 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	12235 [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	12236 }
54f760a257f3 iOS: initial support for iOS Dark Mode... untested. Part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2450 diff changeset	12237 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	12238 _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	12239 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	12240 }
2372 df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12241 default:
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12242 return DW_FEATURE_UNSUPPORTED;
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12243 }
df0a66945296 iOS: Initial commit of iOS source... based on MacOS code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12244 }

Mercurial > dwindows

annotate ios/dw.m @ 2882:99311a9091af